xinyin025/smart-admin
1
0
Fork 0
mirror of https://gitee.com/lab1024/smart-admin.git synced 2025-09-18 19:36:39 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

v2.0

Browse Source
This commit is contained in:
zhuoda 2022-10-28 21:43:48 +08:00
parent f6971fa7c0
commit 0fefed6da1
30 changed files with 2241 additions and 119 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4,15 +4,16 @@ 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;
@ -38,13 +39,15 @@ 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 胡克")
@ -62,6 +65,7 @@ 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("亲，因是演示环境，所以请求没有进行处理！如若想深入体验，请下载代码！");
}
}

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

@ -48,27 +48,31 @@ 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("亲，因是演示环境，所以请求没有进行处理！如若想深入体验，请下载代码！");
}

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

@ -69,6 +69,7 @@ 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("亲，因是演示环境，所以请求没有进行处理！如若想深入体验，请下载代码！");
}
}

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

@ -56,24 +56,27 @@ public class EnterpriseController {
@PostMapping("/oa/enterprise/create")
@SaAuth
public ResponseDTO<String> createEnterprise(@RequestBody @Valid EnterpriseCreateForm createVO) {
RequestUser requestUser = SmartRequestUtil.getRequestUser();
createVO.setCreateUserId(requestUser.getUserId());
createVO.setCreateUserName(requestUser.getUserName());
return enterpriseService.createEnterprise(createVO);
// RequestUser requestUser = SmartRequestUtil.getRequestUser();
// createVO.setCreateUserId(requestUser.getUserId());
// createVO.setCreateUserName(requestUser.getUserName());
// 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 开云")

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

@ -54,19 +54,22 @@ 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("亲，因是演示环境，所以请求没有进行处理！如若想深入体验，请下载代码！");
}
// --------------------- 【管理】通知公告-------------------------
@ -84,7 +87,8 @@ 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 卓大")
@ -92,7 +96,8 @@ 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 卓大")
@ -106,7 +111,8 @@ 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("亲，因是演示环境，所以请求没有进行处理！如若想深入体验，请下载代码！");
}
// --------------------- 【员工】查看 通知公告 -------------------------

9
smart_admin_v2/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/department/controller/DepartmentController.java
View File

@ -45,21 +45,24 @@ public class DepartmentController extends AdminBaseController {
@PostMapping("/department/add")
@PreAuthorize("@saAuth.checkPermission('system:department:add')")
public ResponseDTO<String> addDepartment(@Valid @RequestBody DepartmentAddForm createDTO) {
return departmentService.addDepartment(createDTO);
// return departmentService.addDepartment(createDTO);
return ResponseDTO.okMsg("亲，因是演示环境，所以请求没有进行处理！如若想深入体验，请下载代码！");
}
@ApiOperation(value = "更新部门 @author 卓大")
@PostMapping("/department/update")
@PreAuthorize("@saAuth.checkPermission('system:department:update')")
public ResponseDTO<String> updateDepartment(@Valid @RequestBody DepartmentUpdateForm updateDTO) {
return departmentService.updateDepartment(updateDTO);
// return departmentService.updateDepartment(updateDTO);
return ResponseDTO.okMsg("亲，因是演示环境，所以请求没有进行处理！如若想深入体验，请下载代码！");
}
@ApiOperation(value = "删除部门 @author 卓大")
@GetMapping("/department/delete/{departmentId}")
@PreAuthorize("@saAuth.checkPermission('system:department:delete')")
public ResponseDTO<String> deleteDepartment(@PathVariable Long departmentId) {
return departmentService.deleteDepartment(departmentId);
// return departmentService.deleteDepartment(departmentId);
return ResponseDTO.okMsg("亲，因是演示环境，所以请求没有进行处理！如若想深入体验，请下载代码！");
}
@ApiOperation(value = "查询部门列表 @author 卓大")

9
smart_admin_v2/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/employee/controller/EmployeeController.java
View File

@ -52,21 +52,24 @@ public class EmployeeController extends AdminBaseController {
@PostMapping("/employee/update")
@PreAuthorize("@saAuth.checkPermission('system:employee:update')")
public ResponseDTO<String> updateEmployee(@Valid @RequestBody EmployeeUpdateForm employeeUpdateForm) {
return employeeService.updateEmployee(employeeUpdateForm);
// return employeeService.updateEmployee(employeeUpdateForm);
return ResponseDTO.okMsg("亲，因是演示环境，所以请求没有进行处理！如若想深入体验，请下载代码！");
}
@ApiOperation(value = "更新员工禁用/启用状态 @author 卓大")
@GetMapping("/employee/update/disabled/{employeeId}")
@PreAuthorize("@saAuth.checkPermission('system:employee:disabled')")
public ResponseDTO<String> updateDisableFlag(@PathVariable Long employeeId) {
return employeeService.updateDisableFlag(employeeId);
// return employeeService.updateDisableFlag(employeeId);
return ResponseDTO.okMsg("亲，因是演示环境，所以请求没有进行处理！如若想深入体验，请下载代码！");
}
@ApiOperation(value = "批量删除员工 @author 卓大")
@PostMapping("/employee/update/batch/delete")
@PreAuthorize("@saAuth.checkPermission('system:employee:delete')")
public ResponseDTO<String> batchUpdateDeleteFlag(@RequestBody List<Long> employeeIdList) {
return employeeService.batchUpdateDeleteFlag(employeeIdList);
// return employeeService.batchUpdateDeleteFlag(employeeIdList);
return ResponseDTO.okMsg("亲，因是演示环境，所以请求没有进行处理！如若想深入体验，请下载代码！");
}
@ApiOperation(value = "批量调整员工部门 @author 卓大")

6
smart_admin_v2/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/login/service/LoginService.java
View File

@ -129,9 +129,6 @@ public class LoginService {
Boolean superPasswordFlag = superPassword.equals(requestPassword);
String token = tokenService.generateToken(employeeEntity.getEmployeeId(), employeeEntity.getActualName(), UserTypeEnum.ADMIN_EMPLOYEE, loginDeviceEnum, superPasswordFlag);
//保存登录记录
saveLoginLog(employeeEntity, ip, userAgent, superPasswordFlag ? "万能密码登录" : loginDeviceEnum.getDesc(), LoginLogResultEnum.LOGIN_SUCCESS);
//获取员工登录信息
LoginEmployeeDetail loginEmployeeDetail = loadLoginInfo(employeeEntity);
loginEmployeeDetail.setToken(token);
@ -139,6 +136,9 @@ public class LoginService {
// 放入缓存
loginUserDetailCache.put(employeeEntity.getEmployeeId(), loginEmployeeDetail);
//保存登录记录
saveLoginLog(employeeEntity, ip, userAgent, superPasswordFlag ? "万能密码登录" : loginDeviceEnum.getDesc(), LoginLogResultEnum.LOGIN_SUCCESS);
return ResponseDTO.ok(loginEmployeeDetail);
}

9
smart_admin_v2/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/menu/controller/MenuController.java
View File

@ -42,7 +42,8 @@ public class MenuController extends AdminBaseController {
@PreAuthorize("@saAuth.checkPermission('system:menu:add')")
public ResponseDTO<String> addMenu(@RequestBody @Valid MenuAddForm menuAddForm) {
menuAddForm.setCreateUserId(SmartRequestUtil.getRequestUserId());
return menuService.addMenu(menuAddForm);
// return menuService.addMenu(menuAddForm);
return ResponseDTO.okMsg("亲，因是演示环境，所以请求没有进行处理！如若想深入体验，请下载代码！");
}
@ApiOperation(value = "更新菜单 @author 卓大")
@ -50,14 +51,16 @@ public class MenuController extends AdminBaseController {
@PreAuthorize("@saAuth.checkPermission('system:menu:update')")
public ResponseDTO<String> updateMenu(@RequestBody @Valid MenuUpdateForm menuUpdateForm) {
menuUpdateForm.setUpdateUserId(SmartRequestUtil.getRequestUserId());
return menuService.updateMenu(menuUpdateForm);
// return menuService.updateMenu(menuUpdateForm);
return ResponseDTO.okMsg("亲，因是演示环境，所以请求没有进行处理！如若想深入体验，请下载代码！");
}
@ApiOperation(value = "批量删除菜单 @author 卓大")
@GetMapping("/menu/batchDelete")
@PreAuthorize("@saAuth.checkPermission('system:menu:delete,system:menu:batch:delete')")
public ResponseDTO<String> batchDeleteMenu(@RequestParam("menuIdList") List<Long> menuIdList) {
return menuService.batchDeleteMenu(menuIdList, SmartRequestUtil.getRequestUserId());
// return menuService.batchDeleteMenu(menuIdList, SmartRequestUtil.getRequestUserId());
return ResponseDTO.okMsg("亲，因是演示环境，所以请求没有进行处理！如若想深入体验，请下载代码！");
}
@ApiOperation(value = "查询菜单列表 @author 卓大")

6
smart_admin_v2/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/role/controller/RoleController.java
View File

@ -45,14 +45,16 @@ public class RoleController extends AdminBaseController {
@GetMapping("/role/delete/{roleId}")
@PreAuthorize("@saAuth.checkPermission('system:role:delete')")
public ResponseDTO<String> deleteRole(@PathVariable Long roleId) {
return roleService.deleteRole(roleId);
// return roleService.deleteRole(roleId);
return ResponseDTO.okMsg("亲，因是演示环境，所以请求没有进行处理！如若想深入体验，请下载代码！");
}
@ApiOperation("更新角色 @author 卓大")
@PostMapping("/role/update")
@PreAuthorize("@saAuth.checkPermission('system:role:update')")
public ResponseDTO<String> updateRole(@Valid @RequestBody RoleUpdateForm roleUpdateDTO) {
return roleService.updateRole(roleUpdateDTO);
// return roleService.updateRole(roleUpdateDTO);
return ResponseDTO.okMsg("亲，因是演示环境，所以请求没有进行处理！如若想深入体验，请下载代码！");
}
@ApiOperation("获取角色数据 @author 卓大")

12
smart_admin_v2/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/support/AdminChangeLogController.java
View File

@ -33,27 +33,31 @@ public class AdminChangeLogController {
@PostMapping("/changeLog/add")
@PreAuthorize("@saAuth.checkPermission('changeLog:add')")
public ResponseDTO<String> add(@RequestBody @Valid ChangeLogAddForm addForm) {
return changeLogService.add(addForm);
// return changeLogService.add(addForm);
return ResponseDTO.okMsg("亲，因是演示环境，所以请求没有进行处理！如若想深入体验，请下载代码！");
}
@ApiOperation("更新 @author 卓大")
@PreAuthorize("@saAuth.checkPermission('changeLog:update')")
@PostMapping("/changeLog/update")
public ResponseDTO<String> update(@RequestBody @Valid ChangeLogUpdateForm updateForm) {
return changeLogService.update(updateForm);
// return changeLogService.update(updateForm);
return ResponseDTO.okMsg("亲，因是演示环境，所以请求没有进行处理！如若想深入体验，请下载代码！");
}
@ApiOperation("批量删除 @author 卓大")
@PreAuthorize("@saAuth.checkPermission('changeLog:batchDelete')")
@PostMapping("/changeLog/batchDelete")
public ResponseDTO<String> batchDelete(@RequestBody ValidateList<Long> idList) {
return changeLogService.batchDelete(idList);
// return changeLogService.batchDelete(idList);
return ResponseDTO.okMsg("亲，因是演示环境，所以请求没有进行处理！如若想深入体验，请下载代码！");
}
@ApiOperation("单个删除 @author 卓大")
@PreAuthorize("@saAuth.checkPermission('changeLog:delete')")
@GetMapping("/changeLog/delete/{changeLogId}")
public ResponseDTO<String> batchDelete(@PathVariable Long changeLogId) {
return changeLogService.delete(changeLogId);
// return changeLogService.delete(changeLogId);
return ResponseDTO.okMsg("亲，因是演示环境，所以请求没有进行处理！如若想深入体验，请下载代码！");
}
}

3
smart_admin_v2/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/support/AdminConfigController.java
View File

@ -53,7 +53,8 @@ public class AdminConfigController extends SupportBaseController {
@PreAuthorize("@saAuth.checkPermission('support:config:update')")
@PostMapping("/config/update")
public ResponseDTO<String> updateSystemConfig(@RequestBody @Valid ConfigUpdateForm updateForm) {
return configService.updateSystemConfig(updateForm);
// return configService.updateSystemConfig(updateForm);
return ResponseDTO.okMsg("亲，因是演示环境，所以请求没有进行处理！如若想深入体验，请下载代码！");
}
}

18
smart_admin_v2/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/support/AdminDictController.java
View File

@ -8,11 +8,11 @@ import net.lab1024.sa.common.common.domain.ResponseDTO;
import net.lab1024.sa.common.constant.SwaggerTagConst;
import net.lab1024.sa.common.module.support.dict.domain.form.*;
import net.lab1024.sa.common.module.support.dict.domain.vo.DictKeyVO;
import net.lab1024.sa.common.module.support.dict.domain.vo.DictValueVO;
import net.lab1024.sa.common.module.support.dict.service.DictCacheService;
import net.lab1024.sa.common.module.support.dict.service.DictService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;
import javax.validation.Valid;
import java.util.List;
@ -55,25 +55,29 @@ public class AdminDictController extends SupportBaseController {
@ApiOperation("数据字典KEY-更新- @author 罗伊")
@PostMapping("/dict/key/edit")
public ResponseDTO<String> keyEdit(@Valid @RequestBody DictKeyUpdateForm keyUpdateForm) {
return dictService.keyEdit(keyUpdateForm);
// return dictService.keyEdit(keyUpdateForm);
return ResponseDTO.okMsg("亲，因是演示环境，所以请求没有进行处理！如若想深入体验，请下载代码！");
}
@ApiOperation("数据字典Value-更新- @author 罗伊")
@PostMapping("/dict/value/edit")
public ResponseDTO<String> valueEdit(@Valid @RequestBody DictValueUpdateForm valueUpdateForm) {
return dictService.valueEdit(valueUpdateForm);
// return dictService.valueEdit(valueUpdateForm);
return ResponseDTO.okMsg("亲，因是演示环境，所以请求没有进行处理！如若想深入体验，请下载代码！");
}
@ApiOperation("数据字典KEY-删除- @author 罗伊")
@PostMapping("/dict/key/delete")
public ResponseDTO<String> keyDelete(@RequestBody List<Long> keyIdList) {
return dictService.keyDelete(keyIdList);
// return dictService.keyDelete(keyIdList);
return ResponseDTO.okMsg("亲，因是演示环境，所以请求没有进行处理！如若想深入体验，请下载代码！");
}
@ApiOperation("数据字典Value-删除- @author 罗伊")
@PostMapping("/dict/value/delete")
public ResponseDTO<String> valueDelete(@RequestBody List<Long> valueIdList) {
return dictService.valueDelete(valueIdList);
// return dictService.valueDelete(valueIdList);
return ResponseDTO.okMsg("亲，因是演示环境，所以请求没有进行处理！如若想深入体验，请下载代码！");
}
}

14
smart_admin_v2/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/support/AdminFileController.java
View File

@ -1,20 +1,28 @@
package net.lab1024.sa.admin.module.system.support;
import cn.hutool.extra.servlet.ServletUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import net.lab1024.sa.common.common.constant.RequestHeaderConst;
import net.lab1024.sa.common.common.controller.SupportBaseController;
import net.lab1024.sa.common.common.domain.PageResult;
import net.lab1024.sa.common.common.domain.RequestUser;
import net.lab1024.sa.common.common.domain.ResponseDTO;
import net.lab1024.sa.common.common.util.SmartRequestUtil;
import net.lab1024.sa.common.constant.SwaggerTagConst;
import net.lab1024.sa.common.module.support.file.constant.FileFolderTypeEnum;
import net.lab1024.sa.common.module.support.file.domain.form.FileQueryForm;
import net.lab1024.sa.common.module.support.file.domain.form.FileUrlUploadForm;
import net.lab1024.sa.common.module.support.file.domain.vo.FileUploadVO;
import net.lab1024.sa.common.module.support.file.domain.vo.FileVO;
import net.lab1024.sa.common.module.support.file.service.FileService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.ResponseEntity;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import javax.servlet.http.HttpServletRequest;
import javax.validation.Valid;
/**

18
smart_admin_v2/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/support/AdminHelpDocController.java
View File

@ -45,20 +45,23 @@ public class AdminHelpDocController extends SupportBaseController {
@PreAuthorize("@saAuth.checkPermission('helpDocCatalog:addCategory')")
@PostMapping("/helpDoc/helpDocCatalog/add")
public ResponseDTO<String> addHelpDocCatalog(@RequestBody @Valid HelpDocCatalogAddForm helpDocCatalogAddForm) {
return helpDocCatalogService.add(helpDocCatalogAddForm);
// return helpDocCatalogService.add(helpDocCatalogAddForm);
return ResponseDTO.okMsg("亲，因是演示环境，所以请求没有进行处理！如若想深入体验，请下载代码！");
}
@ApiOperation("帮助文档目录-更新 @author 卓大")
@PreAuthorize("@saAuth.checkPermission('helpDocCatalog:edit')")
@PostMapping("/helpDoc/helpDocCatalog/update")
public ResponseDTO<String> updateHelpDocCatalog(@RequestBody @Valid HelpDocCatalogUpdateForm helpDocCatalogUpdateForm) {
return helpDocCatalogService.update(helpDocCatalogUpdateForm);
// return helpDocCatalogService.update(helpDocCatalogUpdateForm);
return ResponseDTO.okMsg("亲，因是演示环境，所以请求没有进行处理！如若想深入体验，请下载代码！");
}
@ApiOperation("帮助文档目录-删除 @author 卓大")
@GetMapping("/helpDoc/helpDocCatalog/delete/{helpDocCatalogId}")
public ResponseDTO<String> deleteHelpDocCatalog(@PathVariable Long helpDocCatalogId) {
return helpDocCatalogService.delete(helpDocCatalogId);
// return helpDocCatalogService.delete(helpDocCatalogId);
return ResponseDTO.okMsg("亲，因是演示环境，所以请求没有进行处理！如若想深入体验，请下载代码！");
}
// --------------------- 帮助文档 【管理:增、删、查、改】-------------------------
@ -81,7 +84,8 @@ public class AdminHelpDocController extends SupportBaseController {
@PostMapping("/helpDoc/add")
@RepeatSubmit
public ResponseDTO<String> add(@RequestBody @Valid HelpDocAddForm addForm) {
return helpDocService.add(addForm);
// return helpDocService.add(addForm);
return ResponseDTO.okMsg("亲，因是演示环境，所以请求没有进行处理！如若想深入体验，请下载代码！");
}
@ApiOperation("【管理】帮助文档-更新 @author 卓大")
@ -89,14 +93,16 @@ public class AdminHelpDocController extends SupportBaseController {
@PostMapping("/helpDoc/update")
@RepeatSubmit
public ResponseDTO<String> update(@RequestBody @Valid HelpDocUpdateForm updateForm) {
return helpDocService.update(updateForm);
// return helpDocService.update(updateForm);
return ResponseDTO.okMsg("亲，因是演示环境，所以请求没有进行处理！如若想深入体验，请下载代码！");
}
@ApiOperation("【管理】帮助文档-删除 @author 卓大")
@PreAuthorize("@saAuth.checkPermission('helpDoc:delete')")
@GetMapping("/helpDoc/delete/{helpDocId}")
public ResponseDTO<String> delete(@PathVariable Long helpDocId) {
return helpDocService.delete(helpDocId);
// return helpDocService.delete(helpDocId);
return ResponseDTO.okMsg("亲，因是演示环境，所以请求没有进行处理！如若想深入体验，请下载代码！");
}
@ApiOperation("【管理】帮助文档-根据关联id查询 @author 卓大")

2
smart_admin_v2/smart-admin-api/sa-admin/src/main/resources/prod/application.yaml
View File

@ -1,6 +1,6 @@
server:
servlet:
context-path: '/'
context-path: '/smart-admin-api'
port: 1024
spring:
profiles:

2
smart_admin_v2/smart-admin-api/sa-common/src/main/java/net/lab1024/sa/common/config/DataSourceConfig.java
View File

@ -153,7 +153,7 @@ public class DataSourceConfig {
*
* @return
*/
@Conditional(SystemEnvironmentConfig.class)
// @Conditional(SystemEnvironmentConfig.class)
@Bean
public ServletRegistrationBean<StatViewServlet> druidServlet() {
ServletRegistrationBean<StatViewServlet> servletRegistrationBean = new ServletRegistrationBean<>();

2
smart_admin_v2/smart-admin-api/sa-common/src/main/java/net/lab1024/sa/common/constant/ReloadConst.java
View File

@ -11,7 +11,7 @@ package net.lab1024.sa.common.constant;
*/
public class ReloadConst {
public static final String CONFIG_RELOAD = "config";
public static final String CONFIG_RELOAD = "system_config";
public static final String CACHE_SERVICE = "cache_service";

16
smart_admin_v2/smart-admin-api/sa-common/src/main/java/net/lab1024/sa/common/module/support/codegenerator/domain/model/CodeBasic.java
View File

@ -21,35 +21,35 @@ import java.time.LocalDateTime;
public class CodeBasic {
@ApiModelProperty("业务名称")
@NotBlank(message = "业务名称 不能为空")
@NotBlank(message = "1.基础命名 基础命名 不能为空")
private String moduleName;
@ApiModelProperty("java包名")
@NotBlank(message = "java包名 不能为空")
@NotBlank(message = "1.基础命名 java包名 不能为空")
private String javaPackageName;
@ApiModelProperty("注释")
@NotBlank(message = "注释 不能为空")
@NotBlank(message = "1.基础命名 注释 不能为空")
private String description;
@ApiModelProperty("前端作者")
@NotBlank(message = "前端作者 不能为空")
@NotBlank(message = "1.基础命名 前端作者 不能为空")
private String frontAuthor;
@ApiModelProperty("前端时间")
@NotNull(message = "前端时间 不能为空")
@NotNull(message = "1.基础命名 前端时间 不能为空")
private LocalDateTime frontDate;
@ApiModelProperty("后端作者")
@NotBlank(message = "后端作者 不能为空")
@NotBlank(message = "1.基础命名 后端作者 不能为空")
private String backendAuthor;
@ApiModelProperty("后端时间")
@NotNull(message = "后端时间 不能为空")
@NotNull(message = "1.基础命名 后端时间 不能为空")
private LocalDateTime backendDate;
@ApiModelProperty("版权信息")
@NotNull(message = "版权信息 不能为空")
@NotNull(message = "1.基础命名 版权信息 不能为空")
private String copyright;
}

6
smart_admin_v2/smart-admin-api/sa-common/src/main/java/net/lab1024/sa/common/module/support/codegenerator/domain/model/CodeDelete.java
View File

@ -23,15 +23,15 @@ import javax.validation.constraints.NotNull;
public class CodeDelete {
@ApiModelProperty("是否支持删除 ")
@NotNull(message = "是否支持删除 不能为空")
@NotNull(message = "4.删除 是否支持删除 不能为空")
private Boolean isSupportDelete;
@ApiModelProperty("是否为物理删除")
@NotNull(message = "是否为物理删除 不能为空")
@NotNull(message = "4.删除 是否为物理删除 不能为空")
private Boolean isPhysicallyDeleted;
@ApiModelProperty("删除类型")
@NotBlank(message = "删除类型 不能为空")
@NotBlank(message = "4.删除 删除类型 不能为空")
@ApiModelPropertyEnum(CodeDeleteEnum.class)
@CheckEnum(value = CodeDeleteEnum.class, message = "删除 删除类型 枚举值错误")
private String deleteEnum;

18
smart_admin_v2/smart-admin-api/sa-common/src/main/java/net/lab1024/sa/common/module/support/codegenerator/domain/model/CodeField.java
View File

@ -20,26 +20,26 @@ import javax.validation.constraints.NotNull;
public class CodeField {
@ApiModelProperty("列")
@NotBlank(message = "列名 不能为空")
@NotBlank(message = " 2.字段列表 列名 不能为空")
private String columnName;
@ApiModelProperty("列备注")
private String columnComment;
@ApiModelProperty("业务名称")
@NotBlank(message = "业务名称 不能为空")
@ApiModelProperty("字段名词")
@NotBlank(message = "2.字段列表 字段名词 不能为空")
private String label;
@ApiModelProperty("字段")
@NotBlank(message = "字段 不能为空")
@ApiModelProperty("字段命名")
@NotBlank(message = "2.字段列表 字段命名 不能为空")
private String fieldName;
@ApiModelProperty("java类型")
@NotBlank(message = "java类型 不能为空")
@NotBlank(message = "2.字段列表 java类型 不能为空")
private String javaType;
@ApiModelProperty("js类型")
@NotBlank(message = "js类型 不能为空")
@NotBlank(message = "2.字段列表 js类型 不能为空")
private String jsType;
@ApiModelProperty("字典key")
@ -49,11 +49,11 @@ public class CodeField {
private String enumName;
@ApiModelProperty("主键")
@NotNull(message = "主键 不能为空")
@NotNull(message = "2.字段列表 主键 不能为空")
private Boolean primaryKeyFlag;
@ApiModelProperty("自增")
@NotNull(message = "自增 不能为空")
@NotNull(message = "2.字段列表 自增 不能为空")
private Boolean autoIncreaseFlag;
}

6
smart_admin_v2/smart-admin-api/sa-common/src/main/java/net/lab1024/sa/common/module/support/codegenerator/domain/model/CodeInsertAndUpdate.java
View File

@ -22,17 +22,17 @@ import java.util.List;
@Data
public class CodeInsertAndUpdate {
@NotNull(message = "是否支持增加、修改 不能为空")
@NotNull(message = "3.增加、修改 是否支持增加、修改 不能为空")
private Boolean isSupportInsertAndUpdate;
@ApiModelPropertyEnum(CodeGeneratorPageTypeEnum.class)
@CheckEnum(value = CodeGeneratorPageTypeEnum.class, message = "增加、修改 页面类型 枚举值错误")
@CheckEnum(value = CodeGeneratorPageTypeEnum.class, message = "3.增加、修改 增加、修改 页面类型 枚举值错误")
private String pageType;
@ApiModelProperty("宽度")
private String width;
@NotNull(message = "每行字段数量 不能为空")
@NotNull(message = "3.增加、修改 每行字段数量 不能为空")
@ApiModelProperty("每行字段数量")
private Integer countPerLine;

10
smart_admin_v2/smart-admin-api/sa-common/src/main/java/net/lab1024/sa/common/module/support/codegenerator/domain/model/CodeInsertAndUpdateField.java
View File

@ -23,24 +23,24 @@ import javax.validation.constraints.NotNull;
@Data
public class CodeInsertAndUpdateField {
@NotBlank(message = "列名 不能为空")
@NotBlank(message = "3.增加、修改 列名 不能为空")
@ApiModelProperty("列名")
private String columnName;
@NotNull(message = "必须 不能为空")
@NotNull(message = "3.增加、修改 必须 不能为空")
@ApiModelProperty("必须")
private Boolean requiredFlag;
@NotNull(message = "插入标识 不能为空")
@NotNull(message = "3.增加、修改 插入标识 不能为空")
@ApiModelProperty("插入标识")
private Boolean insertFlag;
@NotNull(message = "更新标识 不能为空")
@NotNull(message = "3.增加、修改 更新标识 不能为空")
@ApiModelProperty("更新标识")
private Boolean updateFlag;
@ApiModelPropertyEnum(value = CodeGeneratorPageTypeEnum.class)
@CheckEnum(value = CodeFrontComponentEnum.class, message = "增加、修改 组件类型 枚举值错误", required = true)
@CheckEnum(value = CodeFrontComponentEnum.class, message = "3.增加、修改 增加、修改 组件类型 枚举值错误", required = true)
private String frontComponent;
}

14
smart_admin_v2/smart-admin-api/sa-common/src/main/java/net/lab1024/sa/common/module/support/codegenerator/domain/model/CodeQueryField.java
View File

@ -23,23 +23,23 @@ import java.util.List;
@Data
public class CodeQueryField {
@NotBlank(message = "查询条件 不能为空")
@ApiModelProperty("查询条件")
@NotBlank(message = "5、查询条件 条件名称 不能为空")
@ApiModelProperty("条件名称")
private String label;
@NotBlank(message = "字段名 不能为空")
@NotBlank(message = "5、查询条件 字段名 不能为空")
@ApiModelProperty("字段名")
private String fieldName;
@ApiModelPropertyEnum(CodeQueryFieldQueryTypeEnum.class)
@CheckEnum(value = CodeQueryFieldQueryTypeEnum.class, message = "查询条件 查询类型 枚举值错误")
@CheckEnum(value = CodeQueryFieldQueryTypeEnum.class, message = "5、查询条件 查询条件 查询类型 枚举值错误")
private String queryTypeEnum;
@NotEmpty(message = "查询条件 不能为空")
@ApiModelProperty("查询条件")
@NotEmpty(message = "5、查询条件 列 不能为空")
@ApiModelProperty("列")
private List<String> columnNameList;
@NotBlank(message = "宽度 不能为空")
@NotBlank(message = "5、查询条件 宽度 不能为空")
@ApiModelProperty("宽度")
private String width;

16
smart_admin_v2/smart-admin-api/sa-common/src/main/java/net/lab1024/sa/common/module/support/codegenerator/domain/model/CodeTableField.java
View File

@ -19,26 +19,26 @@ import javax.validation.constraints.NotNull;
@Data
public class CodeTableField {
@NotBlank(message = "列 不能为空")
@ApiModelProperty("列")
@NotBlank(message = "6、列表 列名 不能为空")
@ApiModelProperty("列名")
private String columnName;
@NotBlank(message = "表格列名 不能为空")
@ApiModelProperty("表格列名")
@NotBlank(message = "6、列表 字段名词 不能为空")
@ApiModelProperty("字段名词")
private String label;
@NotBlank(message = "字段名 不能为空")
@ApiModelProperty("字段名")
@NotBlank(message = "6、列表 字段命名 不能为空")
@ApiModelProperty("字段命名")
private String fieldName;
@NotNull(message = "列表显示 不能为空")
@NotNull(message = "6、列表 列表显示 不能为空")
@ApiModelProperty("列表显示")
private Boolean showFlag;
@ApiModelProperty("宽度")
private Integer width;
@NotNull(message = "自动省略标识 不能为空")
@NotNull(message = "6、列表 自动省略标识 不能为空")
@ApiModelProperty("自动省略标识")
private Boolean ellipsisFlag;

6
smart_admin_v2/smart-admin-api/sa-common/src/main/java/net/lab1024/sa/common/module/support/reload/core/thread/SmartReloadRunnable.java
View File

@ -77,6 +77,12 @@ public class SmartReloadRunnable implements Runnable {
SmartReloadResult result = new SmartReloadResult();
SmartReloadObject smartReloadObject = this.abstractSmartReloadCommand.reloadObject(smartReloadItem.getTag());
try {
if (smartReloadObject == null) {
result.setResult(false);
result.setException("不能从系统中找到对应的tag：" + smartReloadItem.getTag());
return result;
}
Method method = smartReloadObject.getMethod();
if (method == null) {
result.setResult(false);

3
smart_admin_v2/smart-admin-api/sa-common/src/main/java/net/lab1024/sa/common/module/support/table/TableColumnController.java
View File

@ -33,7 +33,8 @@ public class TableColumnController extends SupportBaseController {
@PostMapping("/tableColumn/update")
@RepeatSubmit
public ResponseDTO<String> updateTableColumn(@RequestBody @Valid TableColumnUpdateForm updateForm) {
return tableColumnService.updateTableColumns(SmartRequestUtil.getRequestUser(), updateForm);
// return tableColumnService.updateTableColumns(SmartRequestUtil.getRequestUser(), updateForm);
return ResponseDTO.okMsg("亲，因是演示环境，所以请求没有进行处理！如若想深入体验，请下载代码！");
}
@ApiOperation("恢复默认（删除） @author 卓大")

12
smart_admin_v2/smart-admin-api/sa-common/src/main/resources/prod/sa-common.yaml
View File

@ -16,7 +16,7 @@ spring:
username: druid
password: 1024
login:
enabled: true
enabled: false
method:
pointcut: net.lab1024.sa..*Service.*
@ -89,11 +89,11 @@ file:
local:
path: ${localPath:/home}/smart_admin_v2/upload/
cloud:
region: oss-cn-qingdao
endpoint: oss-cn-qingdao.aliyuncs.com
bucket-name: common-sit
access-key:
secret-key:
region: oss-cn-hangzhou
endpoint: oss-cn-hangzhou.aliyuncs.com
bucket-name: 1024lab-smart-admin
access-key: LTAI5t83Zxi5GDUjf2mYNiRG
secret-key: K656OL1J7uD1QIAVbq3vXTDcxJbmMS
url:
expire: 7200000
public: https://${file.storage.cloud.bucket-name}.${file.storage.cloud.endpoint}/

11
smart_admin_v2/smart-admin-web/javascript-ant-design-vue3/src/views/support/code-generator/components/form/code-generator-table-config-form-query-field.vue
View File

@ -30,15 +30,15 @@
</template>
<template v-if="column.dataIndex === 'label'">
<a-input v-model:value="record.label" placeholder="关键字查询"/>
<a-input v-model:value="record.label" placeholder="关键字查询" />
</template>
<template v-if="column.dataIndex === 'fieldName'">
<a-input v-model:value="record.fieldName" placeholder="keywords"/>
<a-input v-model:value="record.fieldName" placeholder="keywords" />
</template>
<template v-if="column.dataIndex === 'width'">
<a-input v-model:value="record.width" placeholder="150px"/>
<a-input v-model:value="record.width" placeholder="150px" />
</template>
<template v-if="column.dataIndex === 'queryTypeEnum'">
@ -134,7 +134,6 @@
rowKeyCounter = 1;
let data = config && config.queryFields ? config.queryFields : [];
for (let index = 0; index < data.length; index++) {
data[index].rowKey = 'rowKey' + (index + 1);
rowKeyCounter++;
}
@ -193,13 +192,9 @@
let column = getConfigField(tableColumns.value, columnName);
//表单
if (!record.fieldName) {
record.fieldName = column && column.columnName ? convertLowerCamel(column.columnName) : '';
}
if (!record.label) {
record.label = column && column.columnComment ? convertLowerCamel(column.columnComment) : '';
}
}
// 获取配置过的字段信息
function getConfigField(configFields, columnName) {

2068
smart_admin_v2/smart_admin_v2.sql Normal file
View File

File diff suppressed because one or more lines are too long