clay
/
hcybasenew
1
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

try catch 初始化

This commit is contained in:
20932067@zju.edu.cn 2021-02-20 22:43:40 +08:00
parent 5066c5be8c
commit 242a06b7a6
37 changed files with 1110 additions and 545 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
hchyun/hchyun-admin/src/main/java/com/hchyun/web/controller/common/CaptchaController.java
View File

@ -7,6 +7,9 @@ import javax.annotation.Resource;
import javax.imageio.ImageIO; import javax.imageio.ImageIO;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import com.hchyun.common.constant.ReturnConstants;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value; import org.springframework.beans.factory.annotation.Value;
import org.springframework.util.FastByteArrayOutputStream; import org.springframework.util.FastByteArrayOutputStream;
@ -26,6 +29,8 @@ import com.hchyun.common.utils.uuid.IdUtils;
*/ */
@RestController @RestController
public class CaptchaController { public class CaptchaController {
private Logger logger = LoggerFactory.getLogger(CaptchaController.class);
@Resource(name = "captchaProducer") @Resource(name = "captchaProducer")
private Producer captchaProducer; private Producer captchaProducer;
@ -44,36 +49,41 @@ public class CaptchaController {
*/ */
@GetMapping("/captchaImage") @GetMapping("/captchaImage")
public AjaxResult getCode(HttpServletResponse response) throws IOException { public AjaxResult getCode(HttpServletResponse response) throws IOException {
// 保存验证码信息
String uuid = IdUtils.simpleUUID();
String verifyKey = Constants.CAPTCHA_CODE_KEY + uuid;
String capStr = null, code = null;
BufferedImage image = null;
// 生成验证码
if ("math".equals(captchaType)) {
String capText = captchaProducerMath.createText();
capStr = capText.substring(0, capText.lastIndexOf("@"));
code = capText.substring(capText.lastIndexOf("@") + 1);
image = captchaProducerMath.createImage(capStr);
} else if ("char".equals(captchaType)) {
capStr = code = captchaProducer.createText();
image = captchaProducer.createImage(capStr);
}
redisCache.setCacheObject(verifyKey, code, Constants.CAPTCHA_EXPIRATION, TimeUnit.MINUTES);
// 转换流信息写出
FastByteArrayOutputStream os = new FastByteArrayOutputStream();
try { try {
ImageIO.write(image, "jpg", os); // 保存验证码信息
} catch (IOException e) { String uuid = IdUtils.simpleUUID();
return AjaxResult.error(e.getMessage()); String verifyKey = Constants.CAPTCHA_CODE_KEY + uuid;
}
AjaxResult ajax = AjaxResult.success(); String capStr = null, code = null;
ajax.put("uuid", uuid); BufferedImage image = null;
ajax.put("img", Base64.encode(os.toByteArray()));
return ajax; // 生成验证码
if ("math".equals(captchaType)) {
String capText = captchaProducerMath.createText();
capStr = capText.substring(0, capText.lastIndexOf("@"));
code = capText.substring(capText.lastIndexOf("@") + 1);
image = captchaProducerMath.createImage(capStr);
} else if ("char".equals(captchaType)) {
capStr = code = captchaProducer.createText();
image = captchaProducer.createImage(capStr);
}
redisCache.setCacheObject(verifyKey, code, Constants.CAPTCHA_EXPIRATION, TimeUnit.MINUTES);
// 转换流信息写出
FastByteArrayOutputStream os = new FastByteArrayOutputStream();
try {
ImageIO.write(image, "jpg", os);
} catch (IOException e) {
return AjaxResult.error(e.getMessage());
}
AjaxResult ajax = AjaxResult.success();
ajax.put("uuid", uuid);
ajax.put("img", Base64.encode(os.toByteArray()));
return ajax;
}catch (RuntimeException e){
logger.error(e.getMessage());
return AjaxResult.error(ReturnConstants.SYS_ERROR);
}
} }
} }

4
hchyun/hchyun-admin/src/main/java/com/hchyun/web/controller/common/CommonController.java
View File

@ -25,7 +25,7 @@ import com.hchyun.framework.config.ServerConfig;
*/ */
@RestController @RestController
public class CommonController { public class CommonController {
private static final Logger log = LoggerFactory.getLogger(CommonController.class); private static final Logger logger = LoggerFactory.getLogger(CommonController.class);
@Autowired @Autowired
private ServerConfig serverConfig; private ServerConfig serverConfig;
@ -54,7 +54,7 @@ public class CommonController {
FileUtils.deleteFile(filePath); FileUtils.deleteFile(filePath);
} }
} catch (Exception e) { } catch (Exception e) {
log.error("下载文件失败", e); logger.error("下载文件失败", e);
} }
} }

46
hchyun/hchyun-admin/src/main/java/com/hchyun/web/controller/monitor/LogininforController.java
View File

@ -1,7 +1,11 @@
package com.hchyun.web.controller.monitor; package com.hchyun.web.controller.monitor;
import java.io.Serializable;
import java.util.List; import java.util.List;
import com.hchyun.common.constant.ReturnConstants;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.DeleteMapping; import org.springframework.web.bind.annotation.DeleteMapping;
@ -26,38 +30,60 @@ import com.hchyun.system.service.LogininforService;
@RestController @RestController
@RequestMapping("/monitor/logininfor") @RequestMapping("/monitor/logininfor")
public class LogininforController extends BaseController { public class LogininforController extends BaseController {
private Logger logger = LoggerFactory.getLogger(LogininforController.class);
@Autowired @Autowired
private LogininforService logininforService; private LogininforService logininforService;
@PreAuthorize("@hchyun.hasPermi('monitor:logininfor:list')") @PreAuthorize("@hchyun.hasPermi('monitor:logininfor:list')")
@GetMapping("/list") @GetMapping("/list")
public TableDataInfo list(Logininfor logininfor) { public Serializable list(Logininfor logininfor) {
startPage(); try {
List<Logininfor> list = logininforService.selectLogininforList(logininfor); startPage();
return getDataTable(list); List<Logininfor> list = logininforService.selectLogininforList(logininfor);
return getDataTable(list);
}catch (RuntimeException e){
logger.error(e.getMessage());
return AjaxResult.error(ReturnConstants.SYS_ERROR);
}
} }
@Log(title = "登录日志", businessType = BusinessType.EXPORT) @Log(title = "登录日志", businessType = BusinessType.EXPORT)
@PreAuthorize("@hchyun.hasPermi('monitor:logininfor:export')") @PreAuthorize("@hchyun.hasPermi('monitor:logininfor:export')")
@GetMapping("/export") @GetMapping("/export")
public AjaxResult export(Logininfor logininfor) { public AjaxResult export(Logininfor logininfor) {
List<Logininfor> list = logininforService.selectLogininforList(logininfor); try {
ExcelUtil<Logininfor> util = new ExcelUtil<Logininfor>(Logininfor.class); List<Logininfor> list = logininforService.selectLogininforList(logininfor);
return util.exportExcel(list, "登录日志"); ExcelUtil<Logininfor> util = new ExcelUtil<Logininfor>(Logininfor.class);
return util.exportExcel(list, "登录日志");
}catch (RuntimeException e){
logger.error(e.getMessage());
return AjaxResult.error(ReturnConstants.SYS_ERROR);
}
} }
@PreAuthorize("@hchyun.hasPermi('monitor:logininfor:remove')") @PreAuthorize("@hchyun.hasPermi('monitor:logininfor:remove')")
@Log(title = "登录日志", businessType = BusinessType.DELETE) @Log(title = "登录日志", businessType = BusinessType.DELETE)
@DeleteMapping("/{infoIds}") @DeleteMapping("/{infoIds}")
public AjaxResult remove(@PathVariable Long[] infoIds) { public AjaxResult remove(@PathVariable Long[] infoIds) {
return toAjax(logininforService.deleteLogininforByIds(infoIds)); try {
return toAjax(logininforService.deleteLogininforByIds(infoIds));
}catch (RuntimeException e){
logger.error(e.getMessage());
return AjaxResult.error(ReturnConstants.SYS_ERROR);
}
} }
@PreAuthorize("@hchyun.hasPermi('monitor:logininfor:remove')") @PreAuthorize("@hchyun.hasPermi('monitor:logininfor:remove')")
@Log(title = "登录日志", businessType = BusinessType.CLEAN) @Log(title = "登录日志", businessType = BusinessType.CLEAN)
@DeleteMapping("/clean") @DeleteMapping("/clean")
public AjaxResult clean() { public AjaxResult clean() {
logininforService.cleanLogininfor(); try {
return AjaxResult.success(); logininforService.cleanLogininfor();
return AjaxResult.success();
}catch (RuntimeException e){
logger.error(e.getMessage());
return AjaxResult.error(ReturnConstants.SYS_ERROR);
}
} }
} }

46
hchyun/hchyun-admin/src/main/java/com/hchyun/web/controller/monitor/OperlogController.java
View File

@ -1,7 +1,11 @@
package com.hchyun.web.controller.monitor; package com.hchyun.web.controller.monitor;
import java.io.Serializable;
import java.util.List; import java.util.List;
import com.hchyun.common.constant.ReturnConstants;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.DeleteMapping; import org.springframework.web.bind.annotation.DeleteMapping;
@ -26,37 +30,59 @@ import com.hchyun.system.service.OperLogService;
@RestController @RestController
@RequestMapping("/monitor/operlog") @RequestMapping("/monitor/operlog")
public class OperlogController extends BaseController { public class OperlogController extends BaseController {
private Logger logger = LoggerFactory.getLogger(OperlogController.class);
@Autowired @Autowired
private OperLogService operLogService; private OperLogService operLogService;
@PreAuthorize("@hchyun.hasPermi('monitor:operlog:list')") @PreAuthorize("@hchyun.hasPermi('monitor:operlog:list')")
@GetMapping("/list") @GetMapping("/list")
public TableDataInfo list(OperLog operLog) { public Serializable list(OperLog operLog) {
startPage(); try {
List<OperLog> list = operLogService.selectOperLogList(operLog); startPage();
return getDataTable(list); List<OperLog> list = operLogService.selectOperLogList(operLog);
return getDataTable(list);
}catch (RuntimeException e){
logger.error(e.getMessage());
return AjaxResult.error(ReturnConstants.SYS_ERROR);
}
} }
@Log(title = "操作日志", businessType = BusinessType.EXPORT) @Log(title = "操作日志", businessType = BusinessType.EXPORT)
@PreAuthorize("@hchyun.hasPermi('monitor:operlog:export')") @PreAuthorize("@hchyun.hasPermi('monitor:operlog:export')")
@GetMapping("/export") @GetMapping("/export")
public AjaxResult export(OperLog operLog) { public AjaxResult export(OperLog operLog) {
List<OperLog> list = operLogService.selectOperLogList(operLog); try {
ExcelUtil<OperLog> util = new ExcelUtil<OperLog>(OperLog.class); List<OperLog> list = operLogService.selectOperLogList(operLog);
return util.exportExcel(list, "操作日志"); ExcelUtil<OperLog> util = new ExcelUtil<OperLog>(OperLog.class);
return util.exportExcel(list, "操作日志");
}catch (RuntimeException e){
logger.error(e.getMessage());
return AjaxResult.error(ReturnConstants.SYS_ERROR);
}
} }
@PreAuthorize("@hchyun.hasPermi('monitor:operlog:remove')") @PreAuthorize("@hchyun.hasPermi('monitor:operlog:remove')")
@DeleteMapping("/{operIds}") @DeleteMapping("/{operIds}")
public AjaxResult remove(@PathVariable Long[] operIds) { public AjaxResult remove(@PathVariable Long[] operIds) {
return toAjax(operLogService.deleteOperLogByIds(operIds)); try {
return toAjax(operLogService.deleteOperLogByIds(operIds));
}catch (RuntimeException e){
logger.error(e.getMessage());
return AjaxResult.error(ReturnConstants.SYS_ERROR);
}
} }
@Log(title = "操作日志", businessType = BusinessType.CLEAN) @Log(title = "操作日志", businessType = BusinessType.CLEAN)
@PreAuthorize("@hchyun.hasPermi('monitor:operlog:remove')") @PreAuthorize("@hchyun.hasPermi('monitor:operlog:remove')")
@DeleteMapping("/clean") @DeleteMapping("/clean")
public AjaxResult clean() { public AjaxResult clean() {
operLogService.cleanOperLog(); try {
return AjaxResult.success(); operLogService.cleanOperLog();
return AjaxResult.success();
}catch (RuntimeException e){
logger.error(e.getMessage());
return AjaxResult.error(ReturnConstants.SYS_ERROR);
}
} }
} }

17
hchyun/hchyun-admin/src/main/java/com/hchyun/web/controller/monitor/ServerController.java
View File

@ -1,5 +1,8 @@
package com.hchyun.web.controller.monitor; package com.hchyun.web.controller.monitor;
import com.hchyun.common.constant.ReturnConstants;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
@ -16,11 +19,19 @@ import com.hchyun.framework.web.domain.Server;
@RestController @RestController
@RequestMapping("/monitor/server") @RequestMapping("/monitor/server")
public class ServerController extends BaseController { public class ServerController extends BaseController {
private Logger logger = LoggerFactory.getLogger(ServerController.class);
@PreAuthorize("@hchyun.hasPermi('monitor:server:list')") @PreAuthorize("@hchyun.hasPermi('monitor:server:list')")
@GetMapping() @GetMapping()
public AjaxResult getInfo() throws Exception { public AjaxResult getInfo() throws Exception {
Server server = new Server(); try {
server.copyTo(); Server server = new Server();
return AjaxResult.success(server); server.copyTo();
return AjaxResult.success(server);
}catch (RuntimeException e){
logger.error(e.getMessage());
return AjaxResult.error(ReturnConstants.SYS_ERROR);
}
} }
} }

62
hchyun/hchyun-admin/src/main/java/com/hchyun/web/controller/monitor/UserOnlineController.java
View File

@ -1,10 +1,14 @@
package com.hchyun.web.controller.monitor; package com.hchyun.web.controller.monitor;
import java.io.Serializable;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collection; import java.util.Collection;
import java.util.Collections; import java.util.Collections;
import java.util.List; import java.util.List;
import com.hchyun.common.constant.ReturnConstants;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.DeleteMapping; import org.springframework.web.bind.annotation.DeleteMapping;
@ -32,6 +36,8 @@ import com.hchyun.system.service.UserOnlineService;
@RestController @RestController
@RequestMapping("/monitor/online") @RequestMapping("/monitor/online")
public class UserOnlineController extends BaseController { public class UserOnlineController extends BaseController {
private Logger logger = LoggerFactory.getLogger(UserOnlineController.class);
@Autowired @Autowired
private UserOnlineService userOnlineService; private UserOnlineService userOnlineService;
@ -40,30 +46,35 @@ public class UserOnlineController extends BaseController {
@PreAuthorize("@hchyun.hasPermi('monitor:online:list')") @PreAuthorize("@hchyun.hasPermi('monitor:online:list')")
@GetMapping("/list") @GetMapping("/list")
public TableDataInfo list(String ipaddr, String userName) { public Serializable list(String ipaddr, String userName) {
Collection<String> keys = redisCache.keys(Constants.LOGIN_TOKEN_KEY + "*"); try {
List<UserOnline> userOnlineList = new ArrayList<UserOnline>(); Collection<String> keys = redisCache.keys(Constants.LOGIN_TOKEN_KEY + "*");
for (String key : keys) { List<UserOnline> userOnlineList = new ArrayList<UserOnline>();
LoginUser user = redisCache.getCacheObject(key); for (String key : keys) {
if (StringUtils.isNotEmpty(ipaddr) && StringUtils.isNotEmpty(userName)) { LoginUser user = redisCache.getCacheObject(key);
if (StringUtils.equals(ipaddr, user.getIpaddr()) && StringUtils.equals(userName, user.getUsername())) { if (StringUtils.isNotEmpty(ipaddr) && StringUtils.isNotEmpty(userName)) {
userOnlineList.add(userOnlineService.selectOnlineByInfo(ipaddr, userName, user)); if (StringUtils.equals(ipaddr, user.getIpaddr()) && StringUtils.equals(userName, user.getUsername())) {
userOnlineList.add(userOnlineService.selectOnlineByInfo(ipaddr, userName, user));
}
} else if (StringUtils.isNotEmpty(ipaddr)) {
if (StringUtils.equals(ipaddr, user.getIpaddr())) {
userOnlineList.add(userOnlineService.selectOnlineByIpaddr(ipaddr, user));
}
} else if (StringUtils.isNotEmpty(userName) && StringUtils.isNotNull(user.getUser())) {
if (StringUtils.equals(userName, user.getUsername())) {
userOnlineList.add(userOnlineService.selectOnlineByUserName(userName, user));
}
} else {
userOnlineList.add(userOnlineService.loginUserToUserOnline(user));
} }
} else if (StringUtils.isNotEmpty(ipaddr)) {
if (StringUtils.equals(ipaddr, user.getIpaddr())) {
userOnlineList.add(userOnlineService.selectOnlineByIpaddr(ipaddr, user));
}
} else if (StringUtils.isNotEmpty(userName) && StringUtils.isNotNull(user.getUser())) {
if (StringUtils.equals(userName, user.getUsername())) {
userOnlineList.add(userOnlineService.selectOnlineByUserName(userName, user));
}
} else {
userOnlineList.add(userOnlineService.loginUserToUserOnline(user));
} }
Collections.reverse(userOnlineList);
userOnlineList.removeAll(Collections.singleton(null));
return getDataTable(userOnlineList);
}catch (RuntimeException e){
logger.error(e.getMessage());
return AjaxResult.error(ReturnConstants.SYS_ERROR);
} }
Collections.reverse(userOnlineList);
userOnlineList.removeAll(Collections.singleton(null));
return getDataTable(userOnlineList);
} }
/** /**
@ -73,7 +84,12 @@ public class UserOnlineController extends BaseController {
@Log(title = "在线用户", businessType = BusinessType.FORCE) @Log(title = "在线用户", businessType = BusinessType.FORCE)
@DeleteMapping("/{tokenId}") @DeleteMapping("/{tokenId}")
public AjaxResult forceLogout(@PathVariable String tokenId) { public AjaxResult forceLogout(@PathVariable String tokenId) {
redisCache.deleteObject(Constants.LOGIN_TOKEN_KEY + tokenId); try {
return AjaxResult.success(); redisCache.deleteObject(Constants.LOGIN_TOKEN_KEY + tokenId);
return AjaxResult.success();
}catch (RuntimeException e){
logger.error(e.getMessage());
return AjaxResult.error(ReturnConstants.SYS_ERROR);
}
} }
} }

4
hchyun/hchyun-admin/src/main/java/com/hchyun/web/controller/system/ConfigController.java
View File

@ -4,6 +4,8 @@ import java.io.Serializable;
import java.util.List; import java.util.List;
import com.hchyun.common.constant.ReturnConstants; import com.hchyun.common.constant.ReturnConstants;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated; import org.springframework.validation.annotation.Validated;
@ -34,6 +36,8 @@ import com.hchyun.system.service.ConfigService;
@RestController @RestController
@RequestMapping("/system/config") @RequestMapping("/system/config")
public class ConfigController extends BaseController { public class ConfigController extends BaseController {
private Logger logger = LoggerFactory.getLogger(ConfigController.class);
@Autowired @Autowired
private ConfigService configService; private ConfigService configService;

69
hchyun/hchyun-admin/src/main/java/com/hchyun/web/controller/system/DictDataController.java
View File

@ -1,7 +1,11 @@
package com.hchyun.web.controller.system; package com.hchyun.web.controller.system;
import java.io.Serializable;
import java.util.List; import java.util.List;
import com.hchyun.common.constant.ReturnConstants;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated; import org.springframework.validation.annotation.Validated;
@ -32,6 +36,8 @@ import com.hchyun.system.service.DictTypeService;
@RestController @RestController
@RequestMapping("/system/dict/data") @RequestMapping("/system/dict/data")
public class DictDataController extends BaseController { public class DictDataController extends BaseController {
private Logger logger = LoggerFactory.getLogger(DictDataController.class);
@Autowired @Autowired
private DictDataService dictDataService; private DictDataService dictDataService;
@ -40,19 +46,29 @@ public class DictDataController extends BaseController {
@PreAuthorize("@hchyun.hasPermi('system:dict:list')") @PreAuthorize("@hchyun.hasPermi('system:dict:list')")
@GetMapping("/list") @GetMapping("/list")
public TableDataInfo list(DictData dictData) { public Serializable list(DictData dictData) {
startPage(); try {
List<DictData> list = dictDataService.selectDictDataList(dictData); startPage();
return getDataTable(list); List<DictData> list = dictDataService.selectDictDataList(dictData);
return getDataTable(list);
}catch (RuntimeException e){
logger.error(e.getMessage());
return AjaxResult.error(ReturnConstants.SYS_ERROR);
}
} }
@Log(title = "字典数据", businessType = BusinessType.EXPORT) @Log(title = "字典数据", businessType = BusinessType.EXPORT)
@PreAuthorize("@hchyun.hasPermi('system:dict:export')") @PreAuthorize("@hchyun.hasPermi('system:dict:export')")
@GetMapping("/export") @GetMapping("/export")
public AjaxResult export(DictData dictData) { public AjaxResult export(DictData dictData) {
List<DictData> list = dictDataService.selectDictDataList(dictData); try {
ExcelUtil<DictData> util = new ExcelUtil<DictData>(DictData.class); List<DictData> list = dictDataService.selectDictDataList(dictData);
return util.exportExcel(list, "字典数据"); ExcelUtil<DictData> util = new ExcelUtil<DictData>(DictData.class);
return util.exportExcel(list, "字典数据");
}catch (RuntimeException e){
logger.error(e.getMessage());
return AjaxResult.error(ReturnConstants.SYS_ERROR);
}
} }
/** /**
@ -61,7 +77,12 @@ public class DictDataController extends BaseController {
@PreAuthorize("@hchyun.hasPermi('system:dict:query')") @PreAuthorize("@hchyun.hasPermi('system:dict:query')")
@GetMapping(value = "/{dictCode}") @GetMapping(value = "/{dictCode}")
public AjaxResult getInfo(@PathVariable Long dictCode) { public AjaxResult getInfo(@PathVariable Long dictCode) {
return AjaxResult.success(dictDataService.selectDictDataById(dictCode)); try {
return AjaxResult.success(dictDataService.selectDictDataById(dictCode));
}catch (RuntimeException e){
logger.error(e.getMessage());
return AjaxResult.error(ReturnConstants.SYS_ERROR);
}
} }
/** /**
@ -69,7 +90,12 @@ public class DictDataController extends BaseController {
*/ */
@GetMapping(value = "/type/{dictType}") @GetMapping(value = "/type/{dictType}")
public AjaxResult dictType(@PathVariable String dictType) { public AjaxResult dictType(@PathVariable String dictType) {
return AjaxResult.success(dictTypeService.selectDictDataByType(dictType)); try {
return AjaxResult.success(dictTypeService.selectDictDataByType(dictType));
}catch (RuntimeException e){
logger.error(e.getMessage());
return AjaxResult.error(ReturnConstants.SYS_ERROR);
}
} }
/** /**
@ -79,8 +105,13 @@ public class DictDataController extends BaseController {
@Log(title = "字典数据", businessType = BusinessType.INSERT) @Log(title = "字典数据", businessType = BusinessType.INSERT)
@PostMapping @PostMapping
public AjaxResult add(@Validated @RequestBody DictData dict) { public AjaxResult add(@Validated @RequestBody DictData dict) {
dict.setCreateBy(SecurityUtils.getUserId()); try {
return toAjax(dictDataService.insertDictData(dict)); dict.setCreateBy(SecurityUtils.getUserId());
return toAjax(dictDataService.insertDictData(dict));
}catch (RuntimeException e){
logger.error(e.getMessage());
return AjaxResult.error(ReturnConstants.SYS_ERROR);
}
} }
/** /**
@ -90,8 +121,13 @@ public class DictDataController extends BaseController {
@Log(title = "字典数据", businessType = BusinessType.UPDATE) @Log(title = "字典数据", businessType = BusinessType.UPDATE)
@PutMapping @PutMapping
public AjaxResult edit(@Validated @RequestBody DictData dict) { public AjaxResult edit(@Validated @RequestBody DictData dict) {
dict.setUpdateBy(SecurityUtils.getUserId()); try {
return toAjax(dictDataService.updateDictData(dict)); dict.setUpdateBy(SecurityUtils.getUserId());
return toAjax(dictDataService.updateDictData(dict));
}catch (RuntimeException e){
logger.error(e.getMessage());
return AjaxResult.error(ReturnConstants.SYS_ERROR);
}
} }
/** /**
@ -101,6 +137,11 @@ public class DictDataController extends BaseController {
@Log(title = "字典类型", businessType = BusinessType.DELETE) @Log(title = "字典类型", businessType = BusinessType.DELETE)
@DeleteMapping("/{dictCodes}") @DeleteMapping("/{dictCodes}")
public AjaxResult remove(@PathVariable Long[] dictCodes) { public AjaxResult remove(@PathVariable Long[] dictCodes) {
return toAjax(dictDataService.deleteDictDataByIds(dictCodes)); try {
return toAjax(dictDataService.deleteDictDataByIds(dictCodes));
}catch (RuntimeException e){
logger.error(e.getMessage());
return AjaxResult.error(ReturnConstants.SYS_ERROR);
}
} }
} }

88
hchyun/hchyun-admin/src/main/java/com/hchyun/web/controller/system/DictTypeController.java
View File

@ -1,7 +1,11 @@
package com.hchyun.web.controller.system; package com.hchyun.web.controller.system;
import java.io.Serializable;
import java.util.List; import java.util.List;
import com.hchyun.common.constant.ReturnConstants;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated; import org.springframework.validation.annotation.Validated;
@ -32,24 +36,36 @@ import com.hchyun.system.service.DictTypeService;
@RestController @RestController
@RequestMapping("/system/dict/type") @RequestMapping("/system/dict/type")
public class DictTypeController extends BaseController { public class DictTypeController extends BaseController {
private Logger logger = LoggerFactory.getLogger(DictTypeController.class);
@Autowired @Autowired
private DictTypeService dictTypeService; private DictTypeService dictTypeService;
@PreAuthorize("@hchyun.hasPermi('system:dict:list')") @PreAuthorize("@hchyun.hasPermi('system:dict:list')")
@GetMapping("/list") @GetMapping("/list")
public TableDataInfo list(DictType dictType) { public Serializable list(DictType dictType) {
startPage(); try {
List<DictType> list = dictTypeService.selectDictTypeList(dictType); startPage();
return getDataTable(list); List<DictType> list = dictTypeService.selectDictTypeList(dictType);
return getDataTable(list);
}catch (RuntimeException e){
logger.error(e.getMessage());
return AjaxResult.error(ReturnConstants.SYS_ERROR);
}
} }
@Log(title = "字典类型", businessType = BusinessType.EXPORT) @Log(title = "字典类型", businessType = BusinessType.EXPORT)
@PreAuthorize("@hchyun.hasPermi('system:dict:export')") @PreAuthorize("@hchyun.hasPermi('system:dict:export')")
@GetMapping("/export") @GetMapping("/export")
public AjaxResult export(DictType dictType) { public AjaxResult export(DictType dictType) {
List<DictType> list = dictTypeService.selectDictTypeList(dictType); try {
ExcelUtil<DictType> util = new ExcelUtil<DictType>(DictType.class); List<DictType> list = dictTypeService.selectDictTypeList(dictType);
return util.exportExcel(list, "字典类型"); ExcelUtil<DictType> util = new ExcelUtil<DictType>(DictType.class);
return util.exportExcel(list, "字典类型");
}catch (RuntimeException e){
logger.error(e.getMessage());
return AjaxResult.error(ReturnConstants.SYS_ERROR);
}
} }
/** /**
@ -58,7 +74,12 @@ public class DictTypeController extends BaseController {
@PreAuthorize("@hchyun.hasPermi('system:dict:query')") @PreAuthorize("@hchyun.hasPermi('system:dict:query')")
@GetMapping(value = "/{dictId}") @GetMapping(value = "/{dictId}")
public AjaxResult getInfo(@PathVariable Long dictId) { public AjaxResult getInfo(@PathVariable Long dictId) {
return AjaxResult.success(dictTypeService.selectDictTypeById(dictId)); try {
return AjaxResult.success(dictTypeService.selectDictTypeById(dictId));
}catch (RuntimeException e){
logger.error(e.getMessage());
return AjaxResult.error(ReturnConstants.SYS_ERROR);
}
} }
/** /**
@ -68,11 +89,16 @@ public class DictTypeController extends BaseController {
@Log(title = "字典类型", businessType = BusinessType.INSERT) @Log(title = "字典类型", businessType = BusinessType.INSERT)
@PostMapping @PostMapping
public AjaxResult add(@Validated @RequestBody DictType dict) { public AjaxResult add(@Validated @RequestBody DictType dict) {
if (UserConstants.NOT_UNIQUE.equals(dictTypeService.checkDictTypeUnique(dict))) { try {
return AjaxResult.error("新增字典'" + dict.getDictName() + "'失败，字典类型已存在"); if (UserConstants.NOT_UNIQUE.equals(dictTypeService.checkDictTypeUnique(dict))) {
return AjaxResult.error("新增字典'" + dict.getDictName() + "'失败，字典类型已存在");
}
dict.setCreateBy(SecurityUtils.getUserId());
return toAjax(dictTypeService.insertDictType(dict));
}catch (RuntimeException e){
logger.error(e.getMessage());
return AjaxResult.error(ReturnConstants.SYS_ERROR);
} }
dict.setCreateBy(SecurityUtils.getUserId());
return toAjax(dictTypeService.insertDictType(dict));
} }
/** /**
@ -82,11 +108,16 @@ public class DictTypeController extends BaseController {
@Log(title = "字典类型", businessType = BusinessType.UPDATE) @Log(title = "字典类型", businessType = BusinessType.UPDATE)
@PutMapping @PutMapping
public AjaxResult edit(@Validated @RequestBody DictType dict) { public AjaxResult edit(@Validated @RequestBody DictType dict) {
if (UserConstants.NOT_UNIQUE.equals(dictTypeService.checkDictTypeUnique(dict))) { try {
return AjaxResult.error("修改字典'" + dict.getDictName() + "'失败，字典类型已存在"); if (UserConstants.NOT_UNIQUE.equals(dictTypeService.checkDictTypeUnique(dict))) {
return AjaxResult.error("修改字典'" + dict.getDictName() + "'失败，字典类型已存在");
}
dict.setUpdateBy(SecurityUtils.getUserId());
return toAjax(dictTypeService.updateDictType(dict));
}catch (RuntimeException e){
logger.error(e.getMessage());
return AjaxResult.error(ReturnConstants.SYS_ERROR);
} }
dict.setUpdateBy(SecurityUtils.getUserId());
return toAjax(dictTypeService.updateDictType(dict));
} }
/** /**
@ -96,7 +127,12 @@ public class DictTypeController extends BaseController {
@Log(title = "字典类型", businessType = BusinessType.DELETE) @Log(title = "字典类型", businessType = BusinessType.DELETE)
@DeleteMapping("/{dictIds}") @DeleteMapping("/{dictIds}")
public AjaxResult remove(@PathVariable Long[] dictIds) { public AjaxResult remove(@PathVariable Long[] dictIds) {
return toAjax(dictTypeService.deleteDictTypeByIds(dictIds)); try {
return toAjax(dictTypeService.deleteDictTypeByIds(dictIds));
}catch (RuntimeException e){
logger.error(e.getMessage());
return AjaxResult.error(ReturnConstants.SYS_ERROR);
}
} }
/** /**
@ -106,8 +142,13 @@ public class DictTypeController extends BaseController {
@Log(title = "字典类型", businessType = BusinessType.CLEAN) @Log(title = "字典类型", businessType = BusinessType.CLEAN)
@DeleteMapping("/clearCache") @DeleteMapping("/clearCache")
public AjaxResult clearCache() { public AjaxResult clearCache() {
dictTypeService.clearCache(); try {
return AjaxResult.success(); dictTypeService.clearCache();
return AjaxResult.success();
}catch (RuntimeException e){
logger.error(e.getMessage());
return AjaxResult.error(ReturnConstants.SYS_ERROR);
}
} }
/** /**
@ -115,7 +156,12 @@ public class DictTypeController extends BaseController {
*/ */
@GetMapping("/optionselect") @GetMapping("/optionselect")
public AjaxResult optionselect() { public AjaxResult optionselect() {
List<DictType> dictTypes = dictTypeService.selectDictTypeAll(); try {
return AjaxResult.success(dictTypes); List<DictType> dictTypes = dictTypeService.selectDictTypeAll();
return AjaxResult.success(dictTypes);
}catch (RuntimeException e){
logger.error(e.getMessage());
return AjaxResult.error(ReturnConstants.SYS_ERROR);
}
} }
} }

64
hchyun/hchyun-admin/src/main/java/com/hchyun/web/controller/system/LoginController.java
View File

@ -3,6 +3,9 @@ package com.hchyun.web.controller.system;
import java.util.List; import java.util.List;
import java.util.Set; import java.util.Set;
import com.hchyun.common.constant.ReturnConstants;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PostMapping;
@ -27,6 +30,8 @@ import com.hchyun.system.service.MenuService;
*/ */
@RestController @RestController
public class LoginController { public class LoginController {
private Logger logger = LoggerFactory.getLogger(LoginController.class);
@Autowired @Autowired
private LoginService loginService; private LoginService loginService;
@ -47,12 +52,17 @@ public class LoginController {
*/ */
@PostMapping("/login") @PostMapping("/login")
public AjaxResult login(@RequestBody LoginBody loginBody) { public AjaxResult login(@RequestBody LoginBody loginBody) {
AjaxResult ajax = AjaxResult.success(); try {
// 生成令牌 AjaxResult ajax = AjaxResult.success();
String token = loginService.login(loginBody.getUsername(), loginBody.getPassword(), loginBody.getCode(), // 生成令牌
loginBody.getUuid()); String token = loginService.login(loginBody.getUsername(), loginBody.getPassword(), loginBody.getCode(),
ajax.put(Constants.TOKEN, token); loginBody.getUuid());
return ajax; ajax.put(Constants.TOKEN, token);
return ajax;
}catch (RuntimeException e){
logger.error(e.getMessage());
return AjaxResult.error(ReturnConstants.SYS_ERROR);
}
} }
/** /**
@ -62,17 +72,22 @@ public class LoginController {
*/ */
@GetMapping("getInfo") @GetMapping("getInfo")
public AjaxResult getInfo() { public AjaxResult getInfo() {
LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest()); try {
User user = loginUser.getUser(); LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
// 角色集合 User user = loginUser.getUser();
Set<String> roles = permissionService.getRolePermission(user); // 角色集合
// 权限集合 Set<String> roles = permissionService.getRolePermission(user);
Set<String> permissions = permissionService.getMenuPermission(user); // 权限集合
AjaxResult ajax = AjaxResult.success(); Set<String> permissions = permissionService.getMenuPermission(user);
ajax.put("user", user); AjaxResult ajax = AjaxResult.success();
ajax.put("roles", roles); ajax.put("user", user);
ajax.put("permissions", permissions); ajax.put("roles", roles);
return ajax; ajax.put("permissions", permissions);
return ajax;
}catch (RuntimeException e){
logger.error(e.getMessage());
return AjaxResult.error(ReturnConstants.SYS_ERROR);
}
} }
/** /**
@ -82,10 +97,15 @@ public class LoginController {
*/ */
@GetMapping("getRouters") @GetMapping("getRouters")
public AjaxResult getRouters() { public AjaxResult getRouters() {
LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest()); try {
// 用户信息 LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
User user = loginUser.getUser(); // 用户信息
List<Menu> menus = menuService.selectMenuTreeByUserId(user.getUserId()); User user = loginUser.getUser();
return AjaxResult.success(menuService.buildMenus(menus)); List<Menu> menus = menuService.selectMenuTreeByUserId(user.getUserId());
return AjaxResult.success(menuService.buildMenus(menus));
}catch (RuntimeException e){
logger.error(e.getMessage());
return AjaxResult.error(ReturnConstants.SYS_ERROR);
}
} }
} }

114
hchyun/hchyun-admin/src/main/java/com/hchyun/web/controller/system/MenuController.java
View File

@ -2,6 +2,9 @@ package com.hchyun.web.controller.system;
import java.util.List; import java.util.List;
import com.hchyun.common.constant.ReturnConstants;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated; import org.springframework.validation.annotation.Validated;
@ -35,6 +38,8 @@ import com.hchyun.system.service.MenuService;
@RestController @RestController
@RequestMapping("/system/menu") @RequestMapping("/system/menu")
public class MenuController extends BaseController { public class MenuController extends BaseController {
private Logger logger = LoggerFactory.getLogger(MenuController.class);
@Autowired @Autowired
private MenuService menuService; private MenuService menuService;
@ -47,10 +52,15 @@ public class MenuController extends BaseController {
@PreAuthorize("@hchyun.hasPermi('system:menu:list')") @PreAuthorize("@hchyun.hasPermi('system:menu:list')")
@GetMapping("/list") @GetMapping("/list")
public AjaxResult list(Menu menu) { public AjaxResult list(Menu menu) {
LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest()); try {
Long userId = loginUser.getUser().getUserId(); LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
List<Menu> menus = menuService.selectMenuList(menu, userId); Long userId = loginUser.getUser().getUserId();
return AjaxResult.success(menus); List<Menu> menus = menuService.selectMenuList(menu, userId);
return AjaxResult.success(menus);
}catch (RuntimeException e){
logger.error(e.getMessage());
return AjaxResult.error(ReturnConstants.SYS_ERROR);
}
} }
/** /**
@ -59,7 +69,12 @@ public class MenuController extends BaseController {
@PreAuthorize("@hchyun.hasPermi('system:menu:query')") @PreAuthorize("@hchyun.hasPermi('system:menu:query')")
@GetMapping(value = "/{menuId}") @GetMapping(value = "/{menuId}")
public AjaxResult getInfo(@PathVariable Long menuId) { public AjaxResult getInfo(@PathVariable Long menuId) {
return AjaxResult.success(menuService.selectMenuById(menuId)); try {
return AjaxResult.success(menuService.selectMenuById(menuId));
}catch (RuntimeException e){
logger.error(e.getMessage());
return AjaxResult.error(ReturnConstants.SYS_ERROR);
}
} }
/** /**
@ -67,10 +82,15 @@ public class MenuController extends BaseController {
*/ */
@GetMapping("/treeselect") @GetMapping("/treeselect")
public AjaxResult treeselect(Menu menu) { public AjaxResult treeselect(Menu menu) {
LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest()); try {
Long userId = loginUser.getUser().getUserId(); LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
List<Menu> menus = menuService.selectMenuList(menu, userId); Long userId = loginUser.getUser().getUserId();
return AjaxResult.success(menuService.buildMenuTreeSelect(menus)); List<Menu> menus = menuService.selectMenuList(menu, userId);
return AjaxResult.success(menuService.buildMenuTreeSelect(menus));
}catch (RuntimeException e){
logger.error(e.getMessage());
return AjaxResult.error(ReturnConstants.SYS_ERROR);
}
} }
/** /**
@ -78,12 +98,17 @@ public class MenuController extends BaseController {
*/ */
@GetMapping(value = "/roleMenuTreeselect/{roleId}") @GetMapping(value = "/roleMenuTreeselect/{roleId}")
public AjaxResult roleMenuTreeselect(@PathVariable("roleId") Long roleId) { public AjaxResult roleMenuTreeselect(@PathVariable("roleId") Long roleId) {
LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest()); try {
List<Menu> menus = menuService.selectMenuList(loginUser.getUser().getUserId()); LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
AjaxResult ajax = AjaxResult.success(); List<Menu> menus = menuService.selectMenuList(loginUser.getUser().getUserId());
ajax.put("checkedKeys", menuService.selectMenuListByRoleId(roleId)); AjaxResult ajax = AjaxResult.success();
ajax.put("menus", menuService.buildMenuTreeSelect(menus)); ajax.put("checkedKeys", menuService.selectMenuListByRoleId(roleId));
return ajax; ajax.put("menus", menuService.buildMenuTreeSelect(menus));
return ajax;
}catch (RuntimeException e){
logger.error(e.getMessage());
return AjaxResult.error(ReturnConstants.SYS_ERROR);
}
} }
/** /**
@ -93,14 +118,19 @@ public class MenuController extends BaseController {
@Log(title = "菜单管理", businessType = BusinessType.INSERT) @Log(title = "菜单管理", businessType = BusinessType.INSERT)
@PostMapping @PostMapping
public AjaxResult add(@Validated @RequestBody Menu menu) { public AjaxResult add(@Validated @RequestBody Menu menu) {
if (UserConstants.NOT_UNIQUE.equals(menuService.checkMenuNameUnique(menu))) { try {
return AjaxResult.error("新增菜单'" + menu.getMenuName() + "'失败，菜单名称已存在"); if (UserConstants.NOT_UNIQUE.equals(menuService.checkMenuNameUnique(menu))) {
} else if (UserConstants.YES_FRAME.equals(menu.getIsFrame()) return AjaxResult.error("新增菜单'" + menu.getMenuName() + "'失败，菜单名称已存在");
&& !StringUtils.startsWithAny(menu.getPath(), Constants.HTTP, Constants.HTTPS)) { } else if (UserConstants.YES_FRAME.equals(menu.getIsFrame())
return AjaxResult.error("新增菜单'" + menu.getMenuName() + "'失败，地址必须以http(s)://开头"); && !StringUtils.startsWithAny(menu.getPath(), Constants.HTTP, Constants.HTTPS)) {
return AjaxResult.error("新增菜单'" + menu.getMenuName() + "'失败，地址必须以http(s)://开头");
}
menu.setCreateBy(SecurityUtils.getUserId());
return toAjax(menuService.insertMenu(menu));
}catch (RuntimeException e){
logger.error(e.getMessage());
return AjaxResult.error(ReturnConstants.SYS_ERROR);
} }
menu.setCreateBy(SecurityUtils.getUserId());
return toAjax(menuService.insertMenu(menu));
} }
/** /**
@ -110,16 +140,21 @@ public class MenuController extends BaseController {
@Log(title = "菜单管理", businessType = BusinessType.UPDATE) @Log(title = "菜单管理", businessType = BusinessType.UPDATE)
@PutMapping @PutMapping
public AjaxResult edit(@Validated @RequestBody Menu menu) { public AjaxResult edit(@Validated @RequestBody Menu menu) {
if (UserConstants.NOT_UNIQUE.equals(menuService.checkMenuNameUnique(menu))) { try {
return AjaxResult.error("修改菜单'" + menu.getMenuName() + "'失败，菜单名称已存在"); if (UserConstants.NOT_UNIQUE.equals(menuService.checkMenuNameUnique(menu))) {
} else if (UserConstants.YES_FRAME.equals(menu.getIsFrame()) return AjaxResult.error("修改菜单'" + menu.getMenuName() + "'失败，菜单名称已存在");
&& !StringUtils.startsWithAny(menu.getPath(), Constants.HTTP, Constants.HTTPS)) { } else if (UserConstants.YES_FRAME.equals(menu.getIsFrame())
return AjaxResult.error("修改菜单'" + menu.getMenuName() + "'失败，地址必须以http(s)://开头"); && !StringUtils.startsWithAny(menu.getPath(), Constants.HTTP, Constants.HTTPS)) {
} else if (menu.getMenuId().equals(menu.getParentId())) { return AjaxResult.error("修改菜单'" + menu.getMenuName() + "'失败，地址必须以http(s)://开头");
return AjaxResult.error("修改菜单'" + menu.getMenuName() + "'失败，上级菜单不能选择自己"); } else if (menu.getMenuId().equals(menu.getParentId())) {
return AjaxResult.error("修改菜单'" + menu.getMenuName() + "'失败，上级菜单不能选择自己");
}
menu.setUpdateBy(SecurityUtils.getUserId());
return toAjax(menuService.updateMenu(menu));
}catch (RuntimeException e){
logger.error(e.getMessage());
return AjaxResult.error(ReturnConstants.SYS_ERROR);
} }
menu.setUpdateBy(SecurityUtils.getUserId());
return toAjax(menuService.updateMenu(menu));
} }
/** /**
@ -129,12 +164,17 @@ public class MenuController extends BaseController {
@Log(title = "菜单管理", businessType = BusinessType.DELETE) @Log(title = "菜单管理", businessType = BusinessType.DELETE)
@DeleteMapping("/{menuId}") @DeleteMapping("/{menuId}")
public AjaxResult remove(@PathVariable("menuId") Long menuId) { public AjaxResult remove(@PathVariable("menuId") Long menuId) {
if (menuService.hasChildByMenuId(menuId)) { try {
return AjaxResult.error("存在子菜单,不允许删除"); if (menuService.hasChildByMenuId(menuId)) {
return AjaxResult.error("存在子菜单,不允许删除");
}
if (menuService.checkMenuExistRole(menuId)) {
return AjaxResult.error("菜单已分配,不允许删除");
}
return toAjax(menuService.deleteMenuById(menuId));
}catch (RuntimeException e){
logger.error(e.getMessage());
return AjaxResult.error(ReturnConstants.SYS_ERROR);
} }
if (menuService.checkMenuExistRole(menuId)) {
return AjaxResult.error("菜单已分配,不允许删除");
}
return toAjax(menuService.deleteMenuById(menuId));
} }
} }

51
hchyun/hchyun-admin/src/main/java/com/hchyun/web/controller/system/NoticeController.java
View File

@ -1,7 +1,11 @@
package com.hchyun.web.controller.system; package com.hchyun.web.controller.system;
import java.io.Serializable;
import java.util.List; import java.util.List;
import com.hchyun.common.constant.ReturnConstants;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated; import org.springframework.validation.annotation.Validated;
@ -30,6 +34,8 @@ import com.hchyun.system.service.NoticeService;
@RestController @RestController
@RequestMapping("/system/notice") @RequestMapping("/system/notice")
public class NoticeController extends BaseController { public class NoticeController extends BaseController {
private Logger logger = LoggerFactory.getLogger(NoticeController.class);
@Autowired @Autowired
private NoticeService noticeService; private NoticeService noticeService;
@ -38,10 +44,15 @@ public class NoticeController extends BaseController {
*/ */
@PreAuthorize("@hchyun.hasPermi('system:notice:list')") @PreAuthorize("@hchyun.hasPermi('system:notice:list')")
@GetMapping("/list") @GetMapping("/list")
public TableDataInfo list(Notice notice) { public Serializable list(Notice notice) {
startPage(); try {
List<Notice> list = noticeService.selectNoticeList(notice); startPage();
return getDataTable(list); List<Notice> list = noticeService.selectNoticeList(notice);
return getDataTable(list);
}catch (RuntimeException e){
logger.error(e.getMessage());
return AjaxResult.error(ReturnConstants.SYS_ERROR);
}
} }
/** /**
@ -50,7 +61,12 @@ public class NoticeController extends BaseController {
@PreAuthorize("@hchyun.hasPermi('system:notice:query')") @PreAuthorize("@hchyun.hasPermi('system:notice:query')")
@GetMapping(value = "/{noticeId}") @GetMapping(value = "/{noticeId}")
public AjaxResult getInfo(@PathVariable Long noticeId) { public AjaxResult getInfo(@PathVariable Long noticeId) {
return AjaxResult.success(noticeService.selectNoticeById(noticeId)); try {
return AjaxResult.success(noticeService.selectNoticeById(noticeId));
}catch (RuntimeException e){
logger.error(e.getMessage());
return AjaxResult.error(ReturnConstants.SYS_ERROR);
}
} }
/** /**
@ -60,8 +76,13 @@ public class NoticeController extends BaseController {
@Log(title = "通知公告", businessType = BusinessType.INSERT) @Log(title = "通知公告", businessType = BusinessType.INSERT)
@PostMapping @PostMapping
public AjaxResult add(@Validated @RequestBody Notice notice) { public AjaxResult add(@Validated @RequestBody Notice notice) {
notice.setCreateBy(SecurityUtils.getUserId()); try {
return toAjax(noticeService.insertNotice(notice)); notice.setCreateBy(SecurityUtils.getUserId());
return toAjax(noticeService.insertNotice(notice));
}catch (RuntimeException e){
logger.error(e.getMessage());
return AjaxResult.error(ReturnConstants.SYS_ERROR);
}
} }
/** /**
@ -71,8 +92,13 @@ public class NoticeController extends BaseController {
@Log(title = "通知公告", businessType = BusinessType.UPDATE) @Log(title = "通知公告", businessType = BusinessType.UPDATE)
@PutMapping @PutMapping
public AjaxResult edit(@Validated @RequestBody Notice notice) { public AjaxResult edit(@Validated @RequestBody Notice notice) {
notice.setUpdateBy(SecurityUtils.getUserId()); try {
return toAjax(noticeService.updateNotice(notice)); notice.setUpdateBy(SecurityUtils.getUserId());
return toAjax(noticeService.updateNotice(notice));
}catch (RuntimeException e){
logger.error(e.getMessage());
return AjaxResult.error(ReturnConstants.SYS_ERROR);
}
} }
/** /**
@ -82,6 +108,11 @@ public class NoticeController extends BaseController {
@Log(title = "通知公告", businessType = BusinessType.DELETE) @Log(title = "通知公告", businessType = BusinessType.DELETE)
@DeleteMapping("/{noticeIds}") @DeleteMapping("/{noticeIds}")
public AjaxResult remove(@PathVariable Long[] noticeIds) { public AjaxResult remove(@PathVariable Long[] noticeIds) {
return toAjax(noticeService.deleteNoticeByIds(noticeIds)); try {
return toAjax(noticeService.deleteNoticeByIds(noticeIds));
}catch (RuntimeException e){
logger.error(e.getMessage());
return AjaxResult.error(ReturnConstants.SYS_ERROR);
}
} }
} }

88
hchyun/hchyun-admin/src/main/java/com/hchyun/web/controller/system/PostController.java
View File

@ -1,7 +1,11 @@
package com.hchyun.web.controller.system; package com.hchyun.web.controller.system;
import java.io.Serializable;
import java.util.List; import java.util.List;
import com.hchyun.common.constant.ReturnConstants;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated; import org.springframework.validation.annotation.Validated;
@ -32,6 +36,9 @@ import com.hchyun.system.service.PostService;
@RestController @RestController
@RequestMapping("/system/post") @RequestMapping("/system/post")
public class PostController extends BaseController { public class PostController extends BaseController {
private Logger logger = LoggerFactory.getLogger(PostController.class);
@Autowired @Autowired
private PostService postService; private PostService postService;
@ -40,19 +47,29 @@ public class PostController extends BaseController {
*/ */
@PreAuthorize("@hchyun.hasPermi('system:post:list')") @PreAuthorize("@hchyun.hasPermi('system:post:list')")
@GetMapping("/list") @GetMapping("/list")
public TableDataInfo list(Post post) { public Serializable list(Post post) {
startPage(); try {
List<Post> list = postService.selectPostList(post); startPage();
return getDataTable(list); List<Post> list = postService.selectPostList(post);
return getDataTable(list);
}catch (RuntimeException e){
logger.error(e.getMessage());
return AjaxResult.error(ReturnConstants.SYS_ERROR);
}
} }
@Log(title = "岗位管理", businessType = BusinessType.EXPORT) @Log(title = "岗位管理", businessType = BusinessType.EXPORT)
@PreAuthorize("@hchyun.hasPermi('system:post:export')") @PreAuthorize("@hchyun.hasPermi('system:post:export')")
@GetMapping("/export") @GetMapping("/export")
public AjaxResult export(Post post) { public AjaxResult export(Post post) {
List<Post> list = postService.selectPostList(post); try {
ExcelUtil<Post> util = new ExcelUtil<Post>(Post.class); List<Post> list = postService.selectPostList(post);
return util.exportExcel(list, "岗位数据"); ExcelUtil<Post> util = new ExcelUtil<Post>(Post.class);
return util.exportExcel(list, "岗位数据");
}catch (RuntimeException e){
logger.error(e.getMessage());
return AjaxResult.error(ReturnConstants.SYS_ERROR);
}
} }
/** /**
@ -61,7 +78,12 @@ public class PostController extends BaseController {
@PreAuthorize("@hchyun.hasPermi('system:post:query')") @PreAuthorize("@hchyun.hasPermi('system:post:query')")
@GetMapping(value = "/{postId}") @GetMapping(value = "/{postId}")
public AjaxResult getInfo(@PathVariable Long postId) { public AjaxResult getInfo(@PathVariable Long postId) {
return AjaxResult.success(postService.selectPostById(postId)); try {
return AjaxResult.success(postService.selectPostById(postId));
}catch (RuntimeException e){
logger.error(e.getMessage());
return AjaxResult.error(ReturnConstants.SYS_ERROR);
}
} }
/** /**
@ -71,13 +93,18 @@ public class PostController extends BaseController {
@Log(title = "岗位管理", businessType = BusinessType.INSERT) @Log(title = "岗位管理", businessType = BusinessType.INSERT)
@PostMapping @PostMapping
public AjaxResult add(@Validated @RequestBody Post post) { public AjaxResult add(@Validated @RequestBody Post post) {
if (UserConstants.NOT_UNIQUE.equals(postService.checkPostNameUnique(post))) { try {
return AjaxResult.error("新增岗位'" + post.getPostName() + "'失败，岗位名称已存在"); if (UserConstants.NOT_UNIQUE.equals(postService.checkPostNameUnique(post))) {
} else if (UserConstants.NOT_UNIQUE.equals(postService.checkPostCodeUnique(post))) { return AjaxResult.error("新增岗位'" + post.getPostName() + "'失败，岗位名称已存在");
return AjaxResult.error("新增岗位'" + post.getPostName() + "'失败，岗位编码已存在"); } else if (UserConstants.NOT_UNIQUE.equals(postService.checkPostCodeUnique(post))) {
return AjaxResult.error("新增岗位'" + post.getPostName() + "'失败，岗位编码已存在");
}
post.setCreateBy(SecurityUtils.getUserId());
return toAjax(postService.insertPost(post));
}catch (RuntimeException e){
logger.error(e.getMessage());
return AjaxResult.error(ReturnConstants.SYS_ERROR);
} }
post.setCreateBy(SecurityUtils.getUserId());
return toAjax(postService.insertPost(post));
} }
/** /**
@ -87,13 +114,18 @@ public class PostController extends BaseController {
@Log(title = "岗位管理", businessType = BusinessType.UPDATE) @Log(title = "岗位管理", businessType = BusinessType.UPDATE)
@PutMapping @PutMapping
public AjaxResult edit(@Validated @RequestBody Post post) { public AjaxResult edit(@Validated @RequestBody Post post) {
if (UserConstants.NOT_UNIQUE.equals(postService.checkPostNameUnique(post))) { try {
return AjaxResult.error("修改岗位'" + post.getPostName() + "'失败，岗位名称已存在"); if (UserConstants.NOT_UNIQUE.equals(postService.checkPostNameUnique(post))) {
} else if (UserConstants.NOT_UNIQUE.equals(postService.checkPostCodeUnique(post))) { return AjaxResult.error("修改岗位'" + post.getPostName() + "'失败，岗位名称已存在");
return AjaxResult.error("修改岗位'" + post.getPostName() + "'失败，岗位编码已存在"); } else if (UserConstants.NOT_UNIQUE.equals(postService.checkPostCodeUnique(post))) {
return AjaxResult.error("修改岗位'" + post.getPostName() + "'失败，岗位编码已存在");
}
post.setUpdateBy(SecurityUtils.getUserId());
return toAjax(postService.updatePost(post));
}catch (RuntimeException e){
logger.error(e.getMessage());
return AjaxResult.error(ReturnConstants.SYS_ERROR);
} }
post.setUpdateBy(SecurityUtils.getUserId());
return toAjax(postService.updatePost(post));
} }
/** /**
@ -103,7 +135,12 @@ public class PostController extends BaseController {
@Log(title = "岗位管理", businessType = BusinessType.DELETE) @Log(title = "岗位管理", businessType = BusinessType.DELETE)
@DeleteMapping("/{postIds}") @DeleteMapping("/{postIds}")
public AjaxResult remove(@PathVariable Long[] postIds) { public AjaxResult remove(@PathVariable Long[] postIds) {
return toAjax(postService.deletePostByIds(postIds)); try {
return toAjax(postService.deletePostByIds(postIds));
}catch (RuntimeException e){
logger.error(e.getMessage());
return AjaxResult.error(ReturnConstants.SYS_ERROR);
}
} }
/** /**
@ -111,7 +148,12 @@ public class PostController extends BaseController {
*/ */
@GetMapping("/optionselect") @GetMapping("/optionselect")
public AjaxResult optionselect() { public AjaxResult optionselect() {
List<Post> posts = postService.selectPostAll(); try {
return AjaxResult.success(posts); List<Post> posts = postService.selectPostAll();
return AjaxResult.success(posts);
}catch (RuntimeException e){
logger.error(e.getMessage());
return AjaxResult.error(ReturnConstants.SYS_ERROR);
}
} }
} }

109
hchyun/hchyun-admin/src/main/java/com/hchyun/web/controller/system/ProfileController.java
View File

@ -2,6 +2,9 @@ package com.hchyun.web.controller.system;
import java.io.IOException; import java.io.IOException;
import com.hchyun.common.constant.ReturnConstants;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PostMapping;
@ -32,6 +35,8 @@ import com.hchyun.system.service.UserService;
@RestController @RestController
@RequestMapping("/system/user/profile") @RequestMapping("/system/user/profile")
public class ProfileController extends BaseController { public class ProfileController extends BaseController {
private Logger logger = LoggerFactory.getLogger(ProfileController.class);
@Autowired @Autowired
private UserService userService; private UserService userService;
@ -43,12 +48,17 @@ public class ProfileController extends BaseController {
*/ */
@GetMapping @GetMapping
public AjaxResult profile() { public AjaxResult profile() {
LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest()); try {
User user = loginUser.getUser(); LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
AjaxResult ajax = AjaxResult.success(user); User user = loginUser.getUser();
ajax.put("roleGroup", userService.selectUserRoleGroup(loginUser.getUsername())); AjaxResult ajax = AjaxResult.success(user);
ajax.put("postGroup", userService.selectUserPostGroup(loginUser.getUsername())); ajax.put("roleGroup", userService.selectUserRoleGroup(loginUser.getUsername()));
return ajax; ajax.put("postGroup", userService.selectUserPostGroup(loginUser.getUsername()));
return ajax;
}catch (RuntimeException e){
logger.error(e.getMessage());
return AjaxResult.error(ReturnConstants.SYS_ERROR);
}
} }
/** /**
@ -57,17 +67,22 @@ public class ProfileController extends BaseController {
@Log(title = "个人信息", businessType = BusinessType.UPDATE) @Log(title = "个人信息", businessType = BusinessType.UPDATE)
@PutMapping @PutMapping
public AjaxResult updateProfile(@RequestBody User user) { public AjaxResult updateProfile(@RequestBody User user) {
if (userService.updateUserProfile(user) > 0) { try {
LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest()); if (userService.updateUserProfile(user) > 0) {
// 更新缓存用户信息 LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
loginUser.getUser().setNickName(user.getNickName()); // 更新缓存用户信息
loginUser.getUser().setPhonenumber(user.getPhonenumber()); loginUser.getUser().setNickName(user.getNickName());
loginUser.getUser().setEmail(user.getEmail()); loginUser.getUser().setPhonenumber(user.getPhonenumber());
loginUser.getUser().setSex(user.getSex()); loginUser.getUser().setEmail(user.getEmail());
tokenService.setLoginUser(loginUser); loginUser.getUser().setSex(user.getSex());
return AjaxResult.success(); tokenService.setLoginUser(loginUser);
return AjaxResult.success();
}
return AjaxResult.error("修改个人信息异常，请联系管理员");
}catch (RuntimeException e){
logger.error(e.getMessage());
return AjaxResult.error(ReturnConstants.SYS_ERROR);
} }
return AjaxResult.error("修改个人信息异常，请联系管理员");
} }
/** /**
@ -76,22 +91,27 @@ public class ProfileController extends BaseController {
@Log(title = "个人信息", businessType = BusinessType.UPDATE) @Log(title = "个人信息", businessType = BusinessType.UPDATE)
@PutMapping("/updatePwd") @PutMapping("/updatePwd")
public AjaxResult updatePwd(String oldPassword, String newPassword) { public AjaxResult updatePwd(String oldPassword, String newPassword) {
LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest()); try {
String userName = loginUser.getUsername(); LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
String password = loginUser.getPassword(); String userName = loginUser.getUsername();
if (!SecurityUtils.matchesPassword(oldPassword, password)) { String password = loginUser.getPassword();
return AjaxResult.error("修改密码失败，旧密码错误"); if (!SecurityUtils.matchesPassword(oldPassword, password)) {
return AjaxResult.error("修改密码失败，旧密码错误");
}
if (SecurityUtils.matchesPassword(newPassword, password)) {
return AjaxResult.error("新密码不能与旧密码相同");
}
if (userService.resetUserPwd(userName, SecurityUtils.encryptPassword(newPassword)) > 0) {
// 更新缓存用户密码
loginUser.getUser().setPassword(SecurityUtils.encryptPassword(newPassword));
tokenService.setLoginUser(loginUser);
return AjaxResult.success();
}
return AjaxResult.error("修改密码异常，请联系管理员");
}catch (RuntimeException e){
logger.error(e.getMessage());
return AjaxResult.error(ReturnConstants.SYS_ERROR);
} }
if (SecurityUtils.matchesPassword(newPassword, password)) {
return AjaxResult.error("新密码不能与旧密码相同");
}
if (userService.resetUserPwd(userName, SecurityUtils.encryptPassword(newPassword)) > 0) {
// 更新缓存用户密码
loginUser.getUser().setPassword(SecurityUtils.encryptPassword(newPassword));
tokenService.setLoginUser(loginUser);
return AjaxResult.success();
}
return AjaxResult.error("修改密码异常，请联系管理员");
} }
/** /**
@ -100,18 +120,23 @@ public class ProfileController extends BaseController {
@Log(title = "用户头像", businessType = BusinessType.UPDATE) @Log(title = "用户头像", businessType = BusinessType.UPDATE)
@PostMapping("/avatar") @PostMapping("/avatar")
public AjaxResult avatar(@RequestParam("avatarfile") MultipartFile file) throws IOException { public AjaxResult avatar(@RequestParam("avatarfile") MultipartFile file) throws IOException {
if (!file.isEmpty()) { try {
LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest()); if (!file.isEmpty()) {
String avatar = FileUploadUtils.upload(HchYunConfig.getAvatarPath(), file); LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
if (userService.updateUserAvatar(loginUser.getUsername(), avatar)) { String avatar = FileUploadUtils.upload(HchYunConfig.getAvatarPath(), file);
AjaxResult ajax = AjaxResult.success(); if (userService.updateUserAvatar(loginUser.getUsername(), avatar)) {
ajax.put("imgUrl", avatar); AjaxResult ajax = AjaxResult.success();
// 更新缓存用户头像 ajax.put("imgUrl", avatar);
loginUser.getUser().setAvatar(avatar); // 更新缓存用户头像
tokenService.setLoginUser(loginUser); loginUser.getUser().setAvatar(avatar);
return ajax; tokenService.setLoginUser(loginUser);
return ajax;
}
} }
return AjaxResult.error("上传图片异常，请联系管理员");
}catch (RuntimeException e){
logger.error(e.getMessage());
return AjaxResult.error(ReturnConstants.SYS_ERROR);
} }
return AjaxResult.error("上传图片异常，请联系管理员");
} }
} }

132
hchyun/hchyun-admin/src/main/java/com/hchyun/web/controller/system/RoleController.java
View File

@ -1,8 +1,11 @@
package com.hchyun.web.controller.system; package com.hchyun.web.controller.system;
import java.io.Serializable;
import java.util.List; import java.util.List;
import com.hchyun.common.constant.ReturnConstants; import com.hchyun.common.constant.ReturnConstants;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated; import org.springframework.validation.annotation.Validated;
@ -39,6 +42,8 @@ import com.hchyun.system.service.UserService;
@RestController @RestController
@RequestMapping("/system/role") @RequestMapping("/system/role")
public class RoleController extends BaseController { public class RoleController extends BaseController {
private Logger logger = LoggerFactory.getLogger(RoleController.class);
@Autowired @Autowired
private RoleService roleService; private RoleService roleService;
@ -53,19 +58,29 @@ public class RoleController extends BaseController {
@PreAuthorize("@hchyun.hasPermi('system:role:list')") @PreAuthorize("@hchyun.hasPermi('system:role:list')")
@GetMapping("/list") @GetMapping("/list")
public TableDataInfo list(Role role) { public Serializable list(Role role) {
startPage(); try {
List<Role> list = roleService.selectRoleList(role); startPage();
return getDataTable(list); List<Role> list = roleService.selectRoleList(role);
return getDataTable(list);
}catch (RuntimeException e){
logger.error(e.getMessage());
return AjaxResult.error(ReturnConstants.SYS_ERROR);
}
} }
@Log(title = "角色管理", businessType = BusinessType.EXPORT) @Log(title = "角色管理", businessType = BusinessType.EXPORT)
@PreAuthorize("@hchyun.hasPermi('system:role:export')") @PreAuthorize("@hchyun.hasPermi('system:role:export')")
@GetMapping("/export") @GetMapping("/export")
public AjaxResult export(Role role) { public AjaxResult export(Role role) {
List<Role> list = roleService.selectRoleList(role); try {
ExcelUtil<Role> util = new ExcelUtil<Role>(Role.class); List<Role> list = roleService.selectRoleList(role);
return util.exportExcel(list, "角色数据"); ExcelUtil<Role> util = new ExcelUtil<Role>(Role.class);
return util.exportExcel(list, "角色数据");
}catch (RuntimeException e){
logger.error(e.getMessage());
return AjaxResult.error(ReturnConstants.SYS_ERROR);
}
} }
/** /**
@ -74,7 +89,12 @@ public class RoleController extends BaseController {
@PreAuthorize("@hchyun.hasPermi('system:role:query')") @PreAuthorize("@hchyun.hasPermi('system:role:query')")
@GetMapping(value = "/{roleId}") @GetMapping(value = "/{roleId}")
public AjaxResult getInfo(@PathVariable Long roleId) { public AjaxResult getInfo(@PathVariable Long roleId) {
return AjaxResult.success(roleService.selectRoleById(roleId)); try {
return AjaxResult.success(roleService.selectRoleById(roleId));
}catch (RuntimeException e){
logger.error(e.getMessage());
return AjaxResult.error(ReturnConstants.SYS_ERROR);
}
} }
/** /**
@ -84,13 +104,18 @@ public class RoleController extends BaseController {
@Log(title = "角色管理", businessType = BusinessType.INSERT) @Log(title = "角色管理", businessType = BusinessType.INSERT)
@PostMapping @PostMapping
public AjaxResult add(@Validated @RequestBody Role role) { public AjaxResult add(@Validated @RequestBody Role role) {
if (UserConstants.NOT_UNIQUE.equals(roleService.checkRoleNameUnique(role))) { try {
return AjaxResult.error("新增角色'" + role.getRoleName() + "'失败，角色名称已存在"); if (UserConstants.NOT_UNIQUE.equals(roleService.checkRoleNameUnique(role))) {
} else if (UserConstants.NOT_UNIQUE.equals(roleService.checkRoleKeyUnique(role))) { return AjaxResult.error("新增角色'" + role.getRoleName() + "'失败，角色名称已存在");
return AjaxResult.error("新增角色'" + role.getRoleName() + "'失败，角色权限已存在"); } else if (UserConstants.NOT_UNIQUE.equals(roleService.checkRoleKeyUnique(role))) {
return AjaxResult.error("新增角色'" + role.getRoleName() + "'失败，角色权限已存在");
}
role.setCreateBy(SecurityUtils.getUserId());
return toAjax(roleService.insertRole(role));
}catch (RuntimeException e){
logger.error(e.getMessage());
return AjaxResult.error(ReturnConstants.SYS_ERROR);
} }
role.setCreateBy(SecurityUtils.getUserId());
return toAjax(roleService.insertRole(role));
} }
@ -101,25 +126,30 @@ public class RoleController extends BaseController {
@Log(title = "角色管理", businessType = BusinessType.UPDATE) @Log(title = "角色管理", businessType = BusinessType.UPDATE)
@PutMapping @PutMapping
public AjaxResult edit(@Validated @RequestBody Role role) { public AjaxResult edit(@Validated @RequestBody Role role) {
roleService.checkRoleAllowed(role); try {
if (UserConstants.NOT_UNIQUE.equals(roleService.checkRoleNameUnique(role))) { roleService.checkRoleAllowed(role);
return AjaxResult.error("修改角色'" + role.getRoleName() + "'失败，角色名称已存在"); if (UserConstants.NOT_UNIQUE.equals(roleService.checkRoleNameUnique(role))) {
} else if (UserConstants.NOT_UNIQUE.equals(roleService.checkRoleKeyUnique(role))) { return AjaxResult.error("修改角色'" + role.getRoleName() + "'失败，角色名称已存在");
return AjaxResult.error("修改角色'" + role.getRoleName() + "'失败，角色权限已存在"); } else if (UserConstants.NOT_UNIQUE.equals(roleService.checkRoleKeyUnique(role))) {
} return AjaxResult.error("修改角色'" + role.getRoleName() + "'失败，角色权限已存在");
role.setUpdateBy(SecurityUtils.getUserId());
if (roleService.updateRole(role) > 0) {
// 更新缓存用户权限
LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
if (StringUtils.isNotNull(loginUser.getUser()) && !loginUser.getUser().isAdmin()) {
loginUser.setPermissions(permissionService.getMenuPermission(loginUser.getUser()));
loginUser.setUser(userService.selectUserByUserName(loginUser.getUser().getUserName()));
tokenService.setLoginUser(loginUser);
} }
return AjaxResult.success(); role.setUpdateBy(SecurityUtils.getUserId());
if (roleService.updateRole(role) > 0) {
// 更新缓存用户权限
LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
if (StringUtils.isNotNull(loginUser.getUser()) && !loginUser.getUser().isAdmin()) {
loginUser.setPermissions(permissionService.getMenuPermission(loginUser.getUser()));
loginUser.setUser(userService.selectUserByUserName(loginUser.getUser().getUserName()));
tokenService.setLoginUser(loginUser);
}
return AjaxResult.success();
}
return AjaxResult.error("修改角色'" + role.getRoleName() + "'失败，请联系管理员");
}catch (RuntimeException e){
logger.error(e.getMessage());
return AjaxResult.error(ReturnConstants.SYS_ERROR);
} }
return AjaxResult.error("修改角色'" + role.getRoleName() + "'失败，请联系管理员");
} }
/** /**
@ -129,8 +159,13 @@ public class RoleController extends BaseController {
@Log(title = "角色管理", businessType = BusinessType.UPDATE) @Log(title = "角色管理", businessType = BusinessType.UPDATE)
@PutMapping("/dataScope") @PutMapping("/dataScope")
public AjaxResult dataScope(@RequestBody Role role) { public AjaxResult dataScope(@RequestBody Role role) {
roleService.checkRoleAllowed(role); try {
return toAjax(roleService.authDataScope(role)); roleService.checkRoleAllowed(role);
return toAjax(roleService.authDataScope(role));
}catch (RuntimeException e){
logger.error(e.getMessage());
return AjaxResult.error(ReturnConstants.SYS_ERROR);
}
} }
/** /**
@ -140,9 +175,14 @@ public class RoleController extends BaseController {
@Log(title = "角色管理", businessType = BusinessType.UPDATE) @Log(title = "角色管理", businessType = BusinessType.UPDATE)
@PutMapping("/changeStatus") @PutMapping("/changeStatus")
public AjaxResult changeStatus(@RequestBody Role role) { public AjaxResult changeStatus(@RequestBody Role role) {
roleService.checkRoleAllowed(role); try {
role.setUpdateBy(SecurityUtils.getUserId()); roleService.checkRoleAllowed(role);
return toAjax(roleService.updateRoleStatus(role)); role.setUpdateBy(SecurityUtils.getUserId());
return toAjax(roleService.updateRoleStatus(role));
}catch (RuntimeException e){
logger.error(e.getMessage());
return AjaxResult.error(ReturnConstants.SYS_ERROR);
}
} }
/** /**
@ -152,7 +192,12 @@ public class RoleController extends BaseController {
@Log(title = "角色管理", businessType = BusinessType.DELETE) @Log(title = "角色管理", businessType = BusinessType.DELETE)
@DeleteMapping("/{roleIds}") @DeleteMapping("/{roleIds}")
public AjaxResult remove(@PathVariable Long[] roleIds) { public AjaxResult remove(@PathVariable Long[] roleIds) {
return toAjax(roleService.deleteRoleByIds(roleIds)); try {
return toAjax(roleService.deleteRoleByIds(roleIds));
}catch (RuntimeException e){
logger.error(e.getMessage());
return AjaxResult.error(ReturnConstants.SYS_ERROR);
}
} }
/** /**
@ -161,10 +206,15 @@ public class RoleController extends BaseController {
@PreAuthorize("@hchyun.hasPermi('system:role:query')") @PreAuthorize("@hchyun.hasPermi('system:role:query')")
@GetMapping("/optionselect") @GetMapping("/optionselect")
public AjaxResult optionselect(Integer type) { public AjaxResult optionselect(Integer type) {
if (type == 1 || type == 2) { try {
return AjaxResult.success(roleService.selectRoleAll(type)); if (type == 1 || type == 2) {
} else { return AjaxResult.success(roleService.selectRoleAll(type));
return AjaxResult.error(ReturnConstants.STATE_ERROR); } else {
return AjaxResult.error(ReturnConstants.STATE_ERROR);
}
}catch (RuntimeException e){
logger.error(e.getMessage());
return AjaxResult.error(ReturnConstants.SYS_ERROR);
} }
} }
} }

152
hchyun/hchyun-admin/src/main/java/com/hchyun/web/controller/system/UserController.java
View File

@ -1,8 +1,12 @@
package com.hchyun.web.controller.system; package com.hchyun.web.controller.system;
import java.io.Serializable;
import java.util.List; import java.util.List;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import com.hchyun.common.constant.ReturnConstants;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated; import org.springframework.validation.annotation.Validated;
@ -41,6 +45,8 @@ import com.hchyun.system.service.UserService;
@RestController @RestController
@RequestMapping("/system/user") @RequestMapping("/system/user")
public class UserController extends BaseController { public class UserController extends BaseController {
private Logger logger = LoggerFactory.getLogger(UserController.class);
@Autowired @Autowired
private UserService userService; private UserService userService;
@ -58,37 +64,57 @@ public class UserController extends BaseController {
*/ */
@PreAuthorize("@hchyun.hasPermi('system:user:list')") @PreAuthorize("@hchyun.hasPermi('system:user:list')")
@GetMapping("/list") @GetMapping("/list")
public TableDataInfo list(User user) { public Serializable list(User user) {
startPage(); try {
List<User> list = userService.selectUserList(user); startPage();
return getDataTable(list); List<User> list = userService.selectUserList(user);
return getDataTable(list);
}catch (RuntimeException e){
logger.error(e.getMessage());
return AjaxResult.error(ReturnConstants.SYS_ERROR);
}
} }
@Log(title = "用户管理", businessType = BusinessType.EXPORT) @Log(title = "用户管理", businessType = BusinessType.EXPORT)
@PreAuthorize("@hchyun.hasPermi('system:user:export')") @PreAuthorize("@hchyun.hasPermi('system:user:export')")
@GetMapping("/export") @GetMapping("/export")
public AjaxResult export(User user) { public AjaxResult export(User user) {
List<User> list = userService.selectUserList(user); try {
ExcelUtil<User> util = new ExcelUtil<User>(User.class); List<User> list = userService.selectUserList(user);
return util.exportExcel(list, "用户数据"); ExcelUtil<User> util = new ExcelUtil<User>(User.class);
return util.exportExcel(list, "用户数据");
}catch (RuntimeException e){
logger.error(e.getMessage());
return AjaxResult.error(ReturnConstants.SYS_ERROR);
}
} }
@Log(title = "用户管理", businessType = BusinessType.IMPORT) @Log(title = "用户管理", businessType = BusinessType.IMPORT)
@PreAuthorize("@hchyun.hasPermi('system:user:import')") @PreAuthorize("@hchyun.hasPermi('system:user:import')")
@PostMapping("/importData") @PostMapping("/importData")
public AjaxResult importData(MultipartFile file, boolean updateSupport) throws Exception { public AjaxResult importData(MultipartFile file, boolean updateSupport) throws Exception {
ExcelUtil<User> util = new ExcelUtil<User>(User.class); try {
List<User> userList = util.importExcel(file.getInputStream()); ExcelUtil<User> util = new ExcelUtil<User>(User.class);
LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest()); List<User> userList = util.importExcel(file.getInputStream());
Long operName = loginUser.getUser().getUserId(); LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
String message = userService.importUser(userList, updateSupport, operName); Long operName = loginUser.getUser().getUserId();
return AjaxResult.success(message); String message = userService.importUser(userList, updateSupport, operName);
return AjaxResult.success(message);
}catch (RuntimeException e){
logger.error(e.getMessage());
return AjaxResult.error(ReturnConstants.SYS_ERROR);
}
} }
@GetMapping("/importTemplate") @GetMapping("/importTemplate")
public AjaxResult importTemplate() { public AjaxResult importTemplate() {
ExcelUtil<User> util = new ExcelUtil<User>(User.class); try {
return util.importTemplateExcel("用户数据"); ExcelUtil<User> util = new ExcelUtil<User>(User.class);
return util.importTemplateExcel("用户数据");
}catch (RuntimeException e){
logger.error(e.getMessage());
return AjaxResult.error(ReturnConstants.SYS_ERROR);
}
} }
/** /**
@ -97,16 +123,21 @@ public class UserController extends BaseController {
@PreAuthorize("@hchyun.hasPermi('system:user:query')") @PreAuthorize("@hchyun.hasPermi('system:user:query')")
@GetMapping(value = {"/", "/{userId}"}) @GetMapping(value = {"/", "/{userId}"})
public AjaxResult getInfo(@PathVariable(value = "userId", required = false) Long userId) { public AjaxResult getInfo(@PathVariable(value = "userId", required = false) Long userId) {
AjaxResult ajax = AjaxResult.success(); try {
List<Role> roles = roleService.selectRoleAll(0); AjaxResult ajax = AjaxResult.success();
ajax.put("roles", User.isAdmin(userId) ? roles : roles.stream().filter(r -> !r.isAdmin()).collect(Collectors.toList())); List<Role> roles = roleService.selectRoleAll(0);
ajax.put("posts", postService.selectPostAll()); ajax.put("roles", User.isAdmin(userId) ? roles : roles.stream().filter(r -> !r.isAdmin()).collect(Collectors.toList()));
if (StringUtils.isNotNull(userId)) { ajax.put("posts", postService.selectPostAll());
ajax.put(AjaxResult.DATA_TAG, userService.selectUserById(userId)); if (StringUtils.isNotNull(userId)) {
ajax.put("postIds", postService.selectPostListByUserId(userId)); ajax.put(AjaxResult.DATA_TAG, userService.selectUserById(userId));
ajax.put("roleIds", roleService.selectRoleListByUserId(userId)); ajax.put("postIds", postService.selectPostListByUserId(userId));
ajax.put("roleIds", roleService.selectRoleListByUserId(userId));
}
return ajax;
}catch (RuntimeException e){
logger.error(e.getMessage());
return AjaxResult.error(ReturnConstants.SYS_ERROR);
} }
return ajax;
} }
/** /**
@ -116,16 +147,21 @@ public class UserController extends BaseController {
@Log(title = "用户管理", businessType = BusinessType.INSERT) @Log(title = "用户管理", businessType = BusinessType.INSERT)
@PostMapping @PostMapping
public AjaxResult add(@Validated @RequestBody User user) { public AjaxResult add(@Validated @RequestBody User user) {
if (UserConstants.NOT_UNIQUE.equals(userService.checkUserNameUnique(user.getUserName()))) { try {
return AjaxResult.error("新增用户'" + user.getUserName() + "'失败，登录账号已存在"); if (UserConstants.NOT_UNIQUE.equals(userService.checkUserNameUnique(user.getUserName()))) {
} else if (UserConstants.NOT_UNIQUE.equals(userService.checkPhoneUnique(user))) { return AjaxResult.error("新增用户'" + user.getUserName() + "'失败，登录账号已存在");
return AjaxResult.error("新增用户'" + user.getUserName() + "'失败，手机号码已存在"); } else if (UserConstants.NOT_UNIQUE.equals(userService.checkPhoneUnique(user))) {
} else if (UserConstants.NOT_UNIQUE.equals(userService.checkEmailUnique(user))) { return AjaxResult.error("新增用户'" + user.getUserName() + "'失败，手机号码已存在");
return AjaxResult.error("新增用户'" + user.getUserName() + "'失败，邮箱账号已存在"); } else if (UserConstants.NOT_UNIQUE.equals(userService.checkEmailUnique(user))) {
return AjaxResult.error("新增用户'" + user.getUserName() + "'失败，邮箱账号已存在");
}
user.setCreateBy(SecurityUtils.getUserId());
user.setPassword(SecurityUtils.encryptPassword(user.getPassword()));
return toAjax(userService.insertUser(user));
}catch (RuntimeException e){
logger.error(e.getMessage());
return AjaxResult.error(ReturnConstants.SYS_ERROR);
} }
user.setCreateBy(SecurityUtils.getUserId());
user.setPassword(SecurityUtils.encryptPassword(user.getPassword()));
return toAjax(userService.insertUser(user));
} }
/** /**
@ -135,14 +171,19 @@ public class UserController extends BaseController {
@Log(title = "用户管理", businessType = BusinessType.UPDATE) @Log(title = "用户管理", businessType = BusinessType.UPDATE)
@PutMapping @PutMapping
public AjaxResult edit(@Validated @RequestBody User user) { public AjaxResult edit(@Validated @RequestBody User user) {
userService.checkUserAllowed(user); try {
if (UserConstants.NOT_UNIQUE.equals(userService.checkPhoneUnique(user))) { userService.checkUserAllowed(user);
return AjaxResult.error("修改用户'" + user.getUserName() + "'失败，手机号码已存在"); if (UserConstants.NOT_UNIQUE.equals(userService.checkPhoneUnique(user))) {
} else if (UserConstants.NOT_UNIQUE.equals(userService.checkEmailUnique(user))) { return AjaxResult.error("修改用户'" + user.getUserName() + "'失败，手机号码已存在");
return AjaxResult.error("修改用户'" + user.getUserName() + "'失败，邮箱账号已存在"); } else if (UserConstants.NOT_UNIQUE.equals(userService.checkEmailUnique(user))) {
return AjaxResult.error("修改用户'" + user.getUserName() + "'失败，邮箱账号已存在");
}
user.setUpdateBy(SecurityUtils.getUserId());
return toAjax(userService.updateUser(user));
}catch (RuntimeException e){
logger.error(e.getMessage());
return AjaxResult.error(ReturnConstants.SYS_ERROR);
} }
user.setUpdateBy(SecurityUtils.getUserId());
return toAjax(userService.updateUser(user));
} }
/** /**
@ -152,7 +193,12 @@ public class UserController extends BaseController {
@Log(title = "用户管理", businessType = BusinessType.DELETE) @Log(title = "用户管理", businessType = BusinessType.DELETE)
@DeleteMapping("/{userIds}") @DeleteMapping("/{userIds}")
public AjaxResult remove(@PathVariable Long[] userIds) { public AjaxResult remove(@PathVariable Long[] userIds) {
return toAjax(userService.deleteUserByIds(userIds)); try {
return toAjax(userService.deleteUserByIds(userIds));
}catch (RuntimeException e){
logger.error(e.getMessage());
return AjaxResult.error(ReturnConstants.SYS_ERROR);
}
} }
/** /**
@ -162,10 +208,15 @@ public class UserController extends BaseController {
@Log(title = "用户管理", businessType = BusinessType.UPDATE) @Log(title = "用户管理", businessType = BusinessType.UPDATE)
@PutMapping("/resetPwd") @PutMapping("/resetPwd")
public AjaxResult resetPwd(@RequestBody User user) { public AjaxResult resetPwd(@RequestBody User user) {
userService.checkUserAllowed(user); try {
user.setPassword(SecurityUtils.encryptPassword(user.getPassword())); userService.checkUserAllowed(user);
user.setUpdateBy(SecurityUtils.getUserId()); user.setPassword(SecurityUtils.encryptPassword(user.getPassword()));
return toAjax(userService.resetPwd(user)); user.setUpdateBy(SecurityUtils.getUserId());
return toAjax(userService.resetPwd(user));
}catch (RuntimeException e){
logger.error(e.getMessage());
return AjaxResult.error(ReturnConstants.SYS_ERROR);
}
} }
/** /**
@ -175,8 +226,13 @@ public class UserController extends BaseController {
@Log(title = "用户管理", businessType = BusinessType.UPDATE) @Log(title = "用户管理", businessType = BusinessType.UPDATE)
@PutMapping("/changeStatus") @PutMapping("/changeStatus")
public AjaxResult changeStatus(@RequestBody User user) { public AjaxResult changeStatus(@RequestBody User user) {
userService.checkUserAllowed(user); try {
user.setUpdateBy(SecurityUtils.getUserId()); userService.checkUserAllowed(user);
return toAjax(userService.updateUserStatus(user)); user.setUpdateBy(SecurityUtils.getUserId());
return toAjax(userService.updateUserStatus(user));
}catch (RuntimeException e){
logger.error(e.getMessage());
return AjaxResult.error(ReturnConstants.SYS_ERROR);
}
} }
} }

2
hchyun/hchyun-common/src/main/java/com/hchyun/common/core/controller/BaseController.java
View File

@ -25,7 +25,7 @@ import com.hchyun.common.utils.sql.SqlUtil;
* @author hchyun * @author hchyun
*/ */
public class BaseController { public class BaseController {
protected final Logger logger = LoggerFactory.getLogger(BaseController.class); protected final Logger log = LoggerFactory.getLogger(BaseController.class);
/** /**
* 将前台传递过来的日期格式的字符串，自动转化为Date类型 * 将前台传递过来的日期格式的字符串，自动转化为Date类型

128
hchyun/hchyun-generator/src/main/java/com/hchyun/generator/controller/GenController.java
View File

@ -1,6 +1,7 @@
package com.hchyun.generator.controller; package com.hchyun.generator.controller;
import java.io.IOException; import java.io.IOException;
import java.io.Serializable;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
@ -9,6 +10,8 @@ import javax.servlet.http.HttpServletResponse;
import com.hchyun.common.constant.ReturnConstants; import com.hchyun.common.constant.ReturnConstants;
import com.hchyun.common.utils.ServerResult; import com.hchyun.common.utils.ServerResult;
import org.apache.commons.io.IOUtils; import org.apache.commons.io.IOUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated; import org.springframework.validation.annotation.Validated;
@ -39,6 +42,8 @@ import com.hchyun.generator.service.GenTableService;
@RestController @RestController
@RequestMapping("/tool/gen") @RequestMapping("/tool/gen")
public class GenController extends BaseController { public class GenController extends BaseController {
private Logger logger = LoggerFactory.getLogger(GenController.class);
@Autowired @Autowired
private GenTableService genTableService; private GenTableService genTableService;
@ -50,10 +55,15 @@ public class GenController extends BaseController {
*/ */
@PreAuthorize("@hchyun.hasPermi('tool:gen:list')") @PreAuthorize("@hchyun.hasPermi('tool:gen:list')")
@GetMapping("/list") @GetMapping("/list")
public TableDataInfo genList(GenTable genTable) { public Serializable genList(GenTable genTable) {
startPage(); try {
List<GenTable> list = genTableService.selectGenTableList(genTable); startPage();
return getDataTable(list); List<GenTable> list = genTableService.selectGenTableList(genTable);
return getDataTable(list);
}catch (RuntimeException e){
logger.error(e.getMessage());
return AjaxResult.error(ReturnConstants.SYS_ERROR);
}
} }
/** /**
@ -62,14 +72,19 @@ public class GenController extends BaseController {
@PreAuthorize("@hchyun.hasPermi('tool:gen:query')") @PreAuthorize("@hchyun.hasPermi('tool:gen:query')")
@GetMapping(value = "/{talbleId}") @GetMapping(value = "/{talbleId}")
public AjaxResult getInfo(@PathVariable Long talbleId) { public AjaxResult getInfo(@PathVariable Long talbleId) {
GenTable table = genTableService.selectGenTableById(talbleId); try {
List<GenTable> tables = genTableService.selectGenTableAll(); GenTable table = genTableService.selectGenTableById(talbleId);
List<GenTableColumn> list = genTableColumnService.selectGenTableColumnListByTableId(talbleId); List<GenTable> tables = genTableService.selectGenTableAll();
Map<String, Object> map = new HashMap<String, Object>(); List<GenTableColumn> list = genTableColumnService.selectGenTableColumnListByTableId(talbleId);
map.put("info", table); Map<String, Object> map = new HashMap<String, Object>();
map.put("rows", list); map.put("info", table);
map.put("tables", tables); map.put("rows", list);
return AjaxResult.success(map); map.put("tables", tables);
return AjaxResult.success(map);
}catch (RuntimeException e){
logger.error(e.getMessage());
return AjaxResult.error(ReturnConstants.SYS_ERROR);
}
} }
/** /**
@ -77,10 +92,15 @@ public class GenController extends BaseController {
*/ */
@PreAuthorize("@hchyun.hasPermi('tool:gen:list')") @PreAuthorize("@hchyun.hasPermi('tool:gen:list')")
@GetMapping("/db/list") @GetMapping("/db/list")
public TableDataInfo dataList(GenTable genTable) { public Serializable dataList(GenTable genTable) {
startPage(); try {
List<GenTable> list = genTableService.selectDbTableList(genTable); startPage();
return getDataTable(list); List<GenTable> list = genTableService.selectDbTableList(genTable);
return getDataTable(list);
}catch (RuntimeException e){
logger.error(e.getMessage());
return AjaxResult.error(ReturnConstants.SYS_ERROR);
}
} }
/** /**
@ -88,12 +108,17 @@ public class GenController extends BaseController {
*/ */
@PreAuthorize("@hchyun.hasPermi('tool:gen:list')") @PreAuthorize("@hchyun.hasPermi('tool:gen:list')")
@GetMapping(value = "/column/{talbleId}") @GetMapping(value = "/column/{talbleId}")
public TableDataInfo columnList(Long tableId) { public Serializable columnList(Long tableId) {
TableDataInfo dataInfo = new TableDataInfo(); try {
List<GenTableColumn> list = genTableColumnService.selectGenTableColumnListByTableId(tableId); TableDataInfo dataInfo = new TableDataInfo();
dataInfo.setRows(list); List<GenTableColumn> list = genTableColumnService.selectGenTableColumnListByTableId(tableId);
dataInfo.setTotal(list.size()); dataInfo.setRows(list);
return dataInfo; dataInfo.setTotal(list.size());
return dataInfo;
}catch (RuntimeException e){
logger.error(e.getMessage());
return AjaxResult.error(ReturnConstants.SYS_ERROR);
}
} }
/** /**
@ -103,11 +128,16 @@ public class GenController extends BaseController {
@Log(title = "代码生成", businessType = BusinessType.IMPORT) @Log(title = "代码生成", businessType = BusinessType.IMPORT)
@PostMapping("/importTable") @PostMapping("/importTable")
public AjaxResult importTableSave(String tables) { public AjaxResult importTableSave(String tables) {
String[] tableNames = Convert.toStrArray(tables); try {
// 查询表信息 String[] tableNames = Convert.toStrArray(tables);
List<GenTable> tableList = genTableService.selectDbTableListByNames(tableNames); // 查询表信息
genTableService.importGenTable(tableList); List<GenTable> tableList = genTableService.selectDbTableListByNames(tableNames);
return AjaxResult.success(); genTableService.importGenTable(tableList);
return AjaxResult.success();
}catch (RuntimeException e){
logger.error(e.getMessage());
return AjaxResult.error(ReturnConstants.SYS_ERROR);
}
} }
/** /**
@ -118,9 +148,14 @@ public class GenController extends BaseController {
@Log(title = "代码生成", businessType = BusinessType.UPDATE) @Log(title = "代码生成", businessType = BusinessType.UPDATE)
@PutMapping @PutMapping
public AjaxResult editSave(@Validated @RequestBody GenTable genTable) { public AjaxResult editSave(@Validated @RequestBody GenTable genTable) {
genTableService.validateEdit(genTable); try {
genTableService.updateGenTable(genTable); genTableService.validateEdit(genTable);
return AjaxResult.success(); genTableService.updateGenTable(genTable);
return AjaxResult.success();
}catch (RuntimeException e){
logger.error(e.getMessage());
return AjaxResult.error(ReturnConstants.SYS_ERROR);
}
} }
/** /**
@ -149,8 +184,13 @@ public class GenController extends BaseController {
@PreAuthorize("@hchyun.hasPermi('tool:gen:preview')") @PreAuthorize("@hchyun.hasPermi('tool:gen:preview')")
@GetMapping("/preview/{tableId}") @GetMapping("/preview/{tableId}")
public AjaxResult preview(@PathVariable("tableId") Long tableId) throws IOException { public AjaxResult preview(@PathVariable("tableId") Long tableId) throws IOException {
Map<String, String> dataMap = genTableService.previewCode(tableId); try {
return AjaxResult.success(dataMap); Map<String, String> dataMap = genTableService.previewCode(tableId);
return AjaxResult.success(dataMap);
}catch (RuntimeException e){
logger.error(e.getMessage());
return AjaxResult.error(ReturnConstants.SYS_ERROR);
}
} }
/** /**
@ -171,11 +211,16 @@ public class GenController extends BaseController {
@Log(title = "代码生成", businessType = BusinessType.GENCODE) @Log(title = "代码生成", businessType = BusinessType.GENCODE)
@GetMapping("/genCode/{tableName}") @GetMapping("/genCode/{tableName}")
public AjaxResult genCode(@PathVariable("tableName") String tableName) { public AjaxResult genCode(@PathVariable("tableName") String tableName) {
boolean start = genTableService.generatorCode(tableName); try {
if (start) { boolean start = genTableService.generatorCode(tableName);
return AjaxResult.success(); if (start) {
} else { return AjaxResult.success();
return AjaxResult.error("模板渲染失败!"); } else {
return AjaxResult.error("模板渲染失败!");
}
}catch (RuntimeException e){
logger.error(e.getMessage());
return AjaxResult.error(ReturnConstants.SYS_ERROR);
} }
} }
@ -186,8 +231,13 @@ public class GenController extends BaseController {
@Log(title = "代码生成", businessType = BusinessType.UPDATE) @Log(title = "代码生成", businessType = BusinessType.UPDATE)
@GetMapping("/synchDb/{tableName}") @GetMapping("/synchDb/{tableName}")
public AjaxResult synchDb(@PathVariable("tableName") String tableName) { public AjaxResult synchDb(@PathVariable("tableName") String tableName) {
genTableService.synchDb(tableName); try {
return AjaxResult.success(); genTableService.synchDb(tableName);
return AjaxResult.success();
}catch (RuntimeException e){
logger.error(e.getMessage());
return AjaxResult.error(ReturnConstants.SYS_ERROR);
}
} }
/** /**

2
hchyun/hchyun-generator/src/main/java/com/hchyun/generator/controller/InterTableController.java
View File

@ -53,8 +53,6 @@ public class InterTableController extends HcyBaseController {
@Autowired @Autowired
private InterTableService interTableService; private InterTableService interTableService;
@Autowired
private ApiclassService apiclassService;
/** /**
* 查询接口信息列表 * 查询接口信息列表

108
hchyun/hchyun-quartz/src/main/java/com/hchyun/quartz/controller/JobController.java
View File

@ -1,8 +1,12 @@
package com.hchyun.quartz.controller; package com.hchyun.quartz.controller;
import java.io.Serializable;
import java.util.List; import java.util.List;
import com.hchyun.common.constant.ReturnConstants;
import org.quartz.SchedulerException; import org.quartz.SchedulerException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.DeleteMapping; import org.springframework.web.bind.annotation.DeleteMapping;
@ -21,8 +25,8 @@ import com.hchyun.common.enums.BusinessType;
import com.hchyun.common.exception.job.TaskException; import com.hchyun.common.exception.job.TaskException;
import com.hchyun.common.utils.SecurityUtils; import com.hchyun.common.utils.SecurityUtils;
import com.hchyun.common.utils.poi.ExcelUtil; import com.hchyun.common.utils.poi.ExcelUtil;
import com.hchyun.quartz.entity.SysJob; import com.hchyun.quartz.entity.Job;
import com.hchyun.quartz.service.ISysJobService; import com.hchyun.quartz.service.JobService;
import com.hchyun.quartz.util.CronUtils; import com.hchyun.quartz.util.CronUtils;
/** /**
@ -33,18 +37,25 @@ import com.hchyun.quartz.util.CronUtils;
@RestController @RestController
@RequestMapping("/monitor/job") @RequestMapping("/monitor/job")
public class JobController extends BaseController { public class JobController extends BaseController {
private Logger logger = LoggerFactory.getLogger(JobController.class);
@Autowired @Autowired
private ISysJobService jobService; private JobService jobService;
/** /**
* 查询定时任务列表 * 查询定时任务列表
*/ */
@PreAuthorize("@hchyun.hasPermi('monitor:job:list')") @PreAuthorize("@hchyun.hasPermi('monitor:job:list')")
@GetMapping("/list") @GetMapping("/list")
public TableDataInfo list(SysJob sysJob) { public Serializable list(Job job) {
startPage(); try {
List<SysJob> list = jobService.selectJobList(sysJob); startPage();
return getDataTable(list); List<Job> list = jobService.selectJobList(job);
return getDataTable(list);
}catch (RuntimeException e){
logger.error(e.getMessage());
return AjaxResult.error(ReturnConstants.SYS_ERROR);
}
} }
/** /**
@ -53,10 +64,15 @@ public class JobController extends BaseController {
@PreAuthorize("@hchyun.hasPermi('monitor:job:export')") @PreAuthorize("@hchyun.hasPermi('monitor:job:export')")
@Log(title = "定时任务", businessType = BusinessType.EXPORT) @Log(title = "定时任务", businessType = BusinessType.EXPORT)
@GetMapping("/export") @GetMapping("/export")
public AjaxResult export(SysJob sysJob) { public AjaxResult export(Job job) {
List<SysJob> list = jobService.selectJobList(sysJob); try {
ExcelUtil<SysJob> util = new ExcelUtil<SysJob>(SysJob.class); List<Job> list = jobService.selectJobList(job);
return util.exportExcel(list, "定时任务"); ExcelUtil<Job> util = new ExcelUtil<Job>(Job.class);
return util.exportExcel(list, "定时任务");
}catch (RuntimeException e){
logger.error(e.getMessage());
return AjaxResult.error(ReturnConstants.SYS_ERROR);
}
} }
/** /**
@ -65,7 +81,12 @@ public class JobController extends BaseController {
@PreAuthorize("@hchyun.hasPermi('monitor:job:query')") @PreAuthorize("@hchyun.hasPermi('monitor:job:query')")
@GetMapping(value = "/{jobId}") @GetMapping(value = "/{jobId}")
public AjaxResult getInfo(@PathVariable("jobId") Long jobId) { public AjaxResult getInfo(@PathVariable("jobId") Long jobId) {
return AjaxResult.success(jobService.selectJobById(jobId)); try {
return AjaxResult.success(jobService.selectJobById(jobId));
}catch (RuntimeException e){
logger.error(e.getMessage());
return AjaxResult.error(ReturnConstants.SYS_ERROR);
}
} }
/** /**
@ -74,12 +95,17 @@ public class JobController extends BaseController {
@PreAuthorize("@hchyun.hasPermi('monitor:job:add')") @PreAuthorize("@hchyun.hasPermi('monitor:job:add')")
@Log(title = "定时任务", businessType = BusinessType.INSERT) @Log(title = "定时任务", businessType = BusinessType.INSERT)
@PostMapping @PostMapping
public AjaxResult add(@RequestBody SysJob sysJob) throws SchedulerException, TaskException { public AjaxResult add(@RequestBody Job job) throws SchedulerException, TaskException {
if (!CronUtils.isValid(sysJob.getCronExpression())) { try {
return AjaxResult.error("cron表达式不正确"); if (!CronUtils.isValid(job.getCronExpression())) {
return AjaxResult.error("cron表达式不正确");
}
job.setCreateBy(SecurityUtils.getUserId());
return toAjax(jobService.insertJob(job));
}catch (RuntimeException e){
logger.error(e.getMessage());
return AjaxResult.error(ReturnConstants.SYS_ERROR);
} }
sysJob.setCreateBy(SecurityUtils.getUserId());
return toAjax(jobService.insertJob(sysJob));
} }
/** /**
@ -88,12 +114,17 @@ public class JobController extends BaseController {
@PreAuthorize("@hchyun.hasPermi('monitor:job:edit')") @PreAuthorize("@hchyun.hasPermi('monitor:job:edit')")
@Log(title = "定时任务", businessType = BusinessType.UPDATE) @Log(title = "定时任务", businessType = BusinessType.UPDATE)
@PutMapping @PutMapping
public AjaxResult edit(@RequestBody SysJob sysJob) throws SchedulerException, TaskException { public AjaxResult edit(@RequestBody Job job) throws SchedulerException, TaskException {
if (!CronUtils.isValid(sysJob.getCronExpression())) { try {
return AjaxResult.error("cron表达式不正确"); if (!CronUtils.isValid(job.getCronExpression())) {
return AjaxResult.error("cron表达式不正确");
}
job.setUpdateBy(SecurityUtils.getUserId());
return toAjax(jobService.updateJob(job));
}catch (RuntimeException e){
logger.error(e.getMessage());
return AjaxResult.error(ReturnConstants.SYS_ERROR);
} }
sysJob.setUpdateBy(SecurityUtils.getUserId());
return toAjax(jobService.updateJob(sysJob));
} }
/** /**
@ -102,10 +133,15 @@ public class JobController extends BaseController {
@PreAuthorize("@hchyun.hasPermi('monitor:job:changeStatus')") @PreAuthorize("@hchyun.hasPermi('monitor:job:changeStatus')")
@Log(title = "定时任务", businessType = BusinessType.UPDATE) @Log(title = "定时任务", businessType = BusinessType.UPDATE)
@PutMapping("/changeStatus") @PutMapping("/changeStatus")
public AjaxResult changeStatus(@RequestBody SysJob job) throws SchedulerException { public AjaxResult changeStatus(@RequestBody Job job) throws SchedulerException {
SysJob newJob = jobService.selectJobById(job.getJobId()); try {
newJob.setStatus(job.getStatus()); Job newJob = jobService.selectJobById(job.getJobId());
return toAjax(jobService.changeStatus(newJob)); newJob.setStatus(job.getStatus());
return toAjax(jobService.changeStatus(newJob));
}catch (RuntimeException e){
logger.error(e.getMessage());
return AjaxResult.error(ReturnConstants.SYS_ERROR);
}
} }
/** /**
@ -114,9 +150,14 @@ public class JobController extends BaseController {
@PreAuthorize("@hchyun.hasPermi('monitor:job:changeStatus')") @PreAuthorize("@hchyun.hasPermi('monitor:job:changeStatus')")
@Log(title = "定时任务", businessType = BusinessType.UPDATE) @Log(title = "定时任务", businessType = BusinessType.UPDATE)
@PutMapping("/run") @PutMapping("/run")
public AjaxResult run(@RequestBody SysJob job) throws SchedulerException { public AjaxResult run(@RequestBody Job job) throws SchedulerException {
jobService.run(job); try {
return AjaxResult.success(); jobService.run(job);
return AjaxResult.success();
}catch (RuntimeException e){
logger.error(e.getMessage());
return AjaxResult.error(ReturnConstants.SYS_ERROR);
}
} }
/** /**
@ -126,7 +167,12 @@ public class JobController extends BaseController {
@Log(title = "定时任务", businessType = BusinessType.DELETE) @Log(title = "定时任务", businessType = BusinessType.DELETE)
@DeleteMapping("/{jobIds}") @DeleteMapping("/{jobIds}")
public AjaxResult remove(@PathVariable Long[] jobIds) throws SchedulerException, TaskException { public AjaxResult remove(@PathVariable Long[] jobIds) throws SchedulerException, TaskException {
jobService.deleteJobByIds(jobIds); try {
return AjaxResult.success(); jobService.deleteJobByIds(jobIds);
return AjaxResult.success();
}catch (RuntimeException e){
logger.error(e.getMessage());
return AjaxResult.error(ReturnConstants.SYS_ERROR);
}
} }
} }

61
hchyun/hchyun-quartz/src/main/java/com/hchyun/quartz/controller/JobLogController.java
View File

@ -1,7 +1,11 @@
package com.hchyun.quartz.controller; package com.hchyun.quartz.controller;
import java.io.Serializable;
import java.util.List; import java.util.List;
import com.hchyun.common.constant.ReturnConstants;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.DeleteMapping; import org.springframework.web.bind.annotation.DeleteMapping;
@ -15,8 +19,8 @@ import com.hchyun.common.core.entity.AjaxResult;
import com.hchyun.common.core.page.TableDataInfo; import com.hchyun.common.core.page.TableDataInfo;
import com.hchyun.common.enums.BusinessType; import com.hchyun.common.enums.BusinessType;
import com.hchyun.common.utils.poi.ExcelUtil; import com.hchyun.common.utils.poi.ExcelUtil;
import com.hchyun.quartz.entity.SysJobLog; import com.hchyun.quartz.entity.JobLog;
import com.hchyun.quartz.service.ISysJobLogService; import com.hchyun.quartz.service.JobLogService;
/** /**
* 调度日志操作处理 * 调度日志操作处理
@ -26,18 +30,25 @@ import com.hchyun.quartz.service.ISysJobLogService;
@RestController @RestController
@RequestMapping("/monitor/jobLog") @RequestMapping("/monitor/jobLog")
public class JobLogController extends BaseController { public class JobLogController extends BaseController {
private Logger logger = LoggerFactory.getLogger(JobLogController.class);
@Autowired @Autowired
private ISysJobLogService jobLogService; private JobLogService jobLogService;
/** /**
* 查询定时任务调度日志列表 * 查询定时任务调度日志列表
*/ */
@PreAuthorize("@hchyun.hasPermi('monitor:job:list')") @PreAuthorize("@hchyun.hasPermi('monitor:job:list')")
@GetMapping("/list") @GetMapping("/list")
public TableDataInfo list(SysJobLog sysJobLog) { public Serializable list(JobLog jobLog) {
startPage(); try {
List<SysJobLog> list = jobLogService.selectJobLogList(sysJobLog); startPage();
return getDataTable(list); List<JobLog> list = jobLogService.selectJobLogList(jobLog);
return getDataTable(list);
}catch (RuntimeException e){
logger.error(e.getMessage());
return AjaxResult.error(ReturnConstants.SYS_ERROR);
}
} }
/** /**
@ -46,10 +57,15 @@ public class JobLogController extends BaseController {
@PreAuthorize("@hchyun.hasPermi('monitor:job:export')") @PreAuthorize("@hchyun.hasPermi('monitor:job:export')")
@Log(title = "任务调度日志", businessType = BusinessType.EXPORT) @Log(title = "任务调度日志", businessType = BusinessType.EXPORT)
@GetMapping("/export") @GetMapping("/export")
public AjaxResult export(SysJobLog sysJobLog) { public AjaxResult export(JobLog jobLog) {
List<SysJobLog> list = jobLogService.selectJobLogList(sysJobLog); try {
ExcelUtil<SysJobLog> util = new ExcelUtil<SysJobLog>(SysJobLog.class); List<JobLog> list = jobLogService.selectJobLogList(jobLog);
return util.exportExcel(list, "调度日志"); ExcelUtil<JobLog> util = new ExcelUtil<JobLog>(JobLog.class);
return util.exportExcel(list, "调度日志");
}catch (RuntimeException e){
logger.error(e.getMessage());
return AjaxResult.error(ReturnConstants.SYS_ERROR);
}
} }
/** /**
@ -58,7 +74,12 @@ public class JobLogController extends BaseController {
@PreAuthorize("@hchyun.hasPermi('monitor:job:query')") @PreAuthorize("@hchyun.hasPermi('monitor:job:query')")
@GetMapping(value = "/{configId}") @GetMapping(value = "/{configId}")
public AjaxResult getInfo(@PathVariable Long jobLogId) { public AjaxResult getInfo(@PathVariable Long jobLogId) {
return AjaxResult.success(jobLogService.selectJobLogById(jobLogId)); try {
return AjaxResult.success(jobLogService.selectJobLogById(jobLogId));
}catch (RuntimeException e){
logger.error(e.getMessage());
return AjaxResult.error(ReturnConstants.SYS_ERROR);
}
} }
@ -69,7 +90,12 @@ public class JobLogController extends BaseController {
@Log(title = "定时任务调度日志", businessType = BusinessType.DELETE) @Log(title = "定时任务调度日志", businessType = BusinessType.DELETE)
@DeleteMapping("/{jobLogIds}") @DeleteMapping("/{jobLogIds}")
public AjaxResult remove(@PathVariable Long[] jobLogIds) { public AjaxResult remove(@PathVariable Long[] jobLogIds) {
return toAjax(jobLogService.deleteJobLogByIds(jobLogIds)); try {
return toAjax(jobLogService.deleteJobLogByIds(jobLogIds));
}catch (RuntimeException e){
logger.error(e.getMessage());
return AjaxResult.error(ReturnConstants.SYS_ERROR);
}
} }
/** /**
@ -79,7 +105,12 @@ public class JobLogController extends BaseController {
@Log(title = "调度日志", businessType = BusinessType.CLEAN) @Log(title = "调度日志", businessType = BusinessType.CLEAN)
@DeleteMapping("/clean") @DeleteMapping("/clean")
public AjaxResult clean() { public AjaxResult clean() {
jobLogService.cleanJobLog(); try {
return AjaxResult.success(); jobLogService.cleanJobLog();
return AjaxResult.success();
}catch (RuntimeException e){
logger.error(e.getMessage());
return AjaxResult.error(ReturnConstants.SYS_ERROR);
}
} }
} }

14
hchyun/hchyun-quartz/src/main/java/com/hchyun/quartz/dao/SysJobDao.java → hchyun/hchyun-quartz/src/main/java/com/hchyun/quartz/dao/JobDao.java
View File

@ -2,28 +2,28 @@ package com.hchyun.quartz.dao;
import java.util.List; import java.util.List;
import com.hchyun.quartz.entity.SysJob; import com.hchyun.quartz.entity.Job;
/** /**
* 调度任务信息 数据层 * 调度任务信息 数据层
* *
* @author hchyun * @author hchyun
*/ */
public interface SysJobDao { public interface JobDao {
/** /**
* 查询调度任务日志集合 * 查询调度任务日志集合
* *
* @param job 调度信息 * @param job 调度信息
* @return 操作日志集合 * @return 操作日志集合
*/ */
public List<SysJob> selectJobList(SysJob job); public List<Job> selectJobList(Job job);
/** /**
* 查询所有调度任务 * 查询所有调度任务
* *
* @return 调度任务列表 * @return 调度任务列表
*/ */
public List<SysJob> selectJobAll(); public List<Job> selectJobAll();
/** /**
* 通过调度ID查询调度任务信息 * 通过调度ID查询调度任务信息
@ -31,7 +31,7 @@ public interface SysJobDao {
* @param jobId 调度ID * @param jobId 调度ID
* @return 角色对象信息 * @return 角色对象信息
*/ */
public SysJob selectJobById(Long jobId); public Job selectJobById(Long jobId);
/** /**
* 通过调度ID删除调度任务信息 * 通过调度ID删除调度任务信息
@ -55,7 +55,7 @@ public interface SysJobDao {
* @param job 调度任务信息 * @param job 调度任务信息
* @return 结果 * @return 结果
*/ */
public int updateJob(SysJob job); public int updateJob(Job job);
/** /**
* 新增调度任务信息 * 新增调度任务信息
@ -63,5 +63,5 @@ public interface SysJobDao {
* @param job 调度任务信息 * @param job 调度任务信息
* @return 结果 * @return 结果
*/ */
public int insertJob(SysJob job); public int insertJob(Job job);
} }

12
hchyun/hchyun-quartz/src/main/java/com/hchyun/quartz/dao/SysJobLogDao.java → hchyun/hchyun-quartz/src/main/java/com/hchyun/quartz/dao/JobLogDao.java
View File

@ -2,28 +2,28 @@ package com.hchyun.quartz.dao;
import java.util.List; import java.util.List;
import com.hchyun.quartz.entity.SysJobLog; import com.hchyun.quartz.entity.JobLog;
/** /**
* 调度任务日志信息 数据层 * 调度任务日志信息 数据层
* *
* @author hchyun * @author hchyun
*/ */
public interface SysJobLogDao { public interface JobLogDao {
/** /**
* 获取quartz调度器日志的计划任务 * 获取quartz调度器日志的计划任务
* *
* @param jobLog 调度日志信息 * @param jobLog 调度日志信息
* @return 调度任务日志集合 * @return 调度任务日志集合
*/ */
public List<SysJobLog> selectJobLogList(SysJobLog jobLog); public List<JobLog> selectJobLogList(JobLog jobLog);
/** /**
* 查询所有调度任务日志 * 查询所有调度任务日志
* *
* @return 调度任务日志列表 * @return 调度任务日志列表
*/ */
public List<SysJobLog> selectJobLogAll(); public List<JobLog> selectJobLogAll();
/** /**
* 通过调度任务日志ID查询调度信息 * 通过调度任务日志ID查询调度信息
@ -31,7 +31,7 @@ public interface SysJobLogDao {
* @param jobLogId 调度任务日志ID * @param jobLogId 调度任务日志ID
* @return 调度任务日志对象信息 * @return 调度任务日志对象信息
*/ */
public SysJobLog selectJobLogById(Long jobLogId); public JobLog selectJobLogById(Long jobLogId);
/** /**
* 新增任务日志 * 新增任务日志
@ -39,7 +39,7 @@ public interface SysJobLogDao {
* @param jobLog 调度日志信息 * @param jobLog 调度日志信息
* @return 结果 * @return 结果
*/ */
public int insertJobLog(SysJobLog jobLog); public int insertJobLog(JobLog jobLog);
/** /**
* 批量删除调度日志信息 * 批量删除调度日志信息

2
hchyun/hchyun-quartz/src/main/java/com/hchyun/quartz/entity/SysJob.java → hchyun/hchyun-quartz/src/main/java/com/hchyun/quartz/entity/Job.java
View File

@ -20,7 +20,7 @@ import com.hchyun.quartz.util.CronUtils;
* *
* @author hchyun * @author hchyun
*/ */
public class SysJob extends BaseEntity implements Serializable { public class Job extends BaseEntity implements Serializable {
/** /**

2
hchyun/hchyun-quartz/src/main/java/com/hchyun/quartz/entity/SysJobLog.java → hchyun/hchyun-quartz/src/main/java/com/hchyun/quartz/entity/JobLog.java
View File

@ -12,7 +12,7 @@ import com.hchyun.common.core.entity.BaseEntity;
* *
* @author hchyun * @author hchyun
*/ */
public class SysJobLog extends BaseEntity { public class JobLog extends BaseEntity {
/** /**

10
hchyun/hchyun-quartz/src/main/java/com/hchyun/quartz/service/ISysJobLogService.java → hchyun/hchyun-quartz/src/main/java/com/hchyun/quartz/service/JobLogService.java
View File

@ -2,21 +2,21 @@ package com.hchyun.quartz.service;
import java.util.List; import java.util.List;
import com.hchyun.quartz.entity.SysJobLog; import com.hchyun.quartz.entity.JobLog;
/** /**
* 定时任务调度日志信息信息 服务层 * 定时任务调度日志信息信息 服务层
* *
* @author hchyun * @author hchyun
*/ */
public interface ISysJobLogService { public interface JobLogService {
/** /**
* 获取quartz调度器日志的计划任务 * 获取quartz调度器日志的计划任务
* *
* @param jobLog 调度日志信息 * @param jobLog 调度日志信息
* @return 调度任务日志集合 * @return 调度任务日志集合
*/ */
public List<SysJobLog> selectJobLogList(SysJobLog jobLog); public List<JobLog> selectJobLogList(JobLog jobLog);
/** /**
* 通过调度任务日志ID查询调度信息 * 通过调度任务日志ID查询调度信息
@ -24,14 +24,14 @@ public interface ISysJobLogService {
* @param jobLogId 调度任务日志ID * @param jobLogId 调度任务日志ID
* @return 调度任务日志对象信息 * @return 调度任务日志对象信息
*/ */
public SysJobLog selectJobLogById(Long jobLogId); public JobLog selectJobLogById(Long jobLogId);
/** /**
* 新增任务日志 * 新增任务日志
* *
* @param jobLog 调度日志信息 * @param jobLog 调度日志信息
*/ */
public void addJobLog(SysJobLog jobLog); public void addJobLog(JobLog jobLog);
/** /**
* 批量删除调度日志信息 * 批量删除调度日志信息

22
hchyun/hchyun-quartz/src/main/java/com/hchyun/quartz/service/ISysJobService.java → hchyun/hchyun-quartz/src/main/java/com/hchyun/quartz/service/JobService.java
View File

@ -4,21 +4,21 @@ import java.util.List;
import org.quartz.SchedulerException; import org.quartz.SchedulerException;
import com.hchyun.common.exception.job.TaskException; import com.hchyun.common.exception.job.TaskException;
import com.hchyun.quartz.entity.SysJob; import com.hchyun.quartz.entity.Job;
/** /**
* 定时任务调度信息信息 服务层 * 定时任务调度信息信息 服务层
* *
* @author hchyun * @author hchyun
*/ */
public interface ISysJobService { public interface JobService {
/** /**
* 获取quartz调度器的计划任务 * 获取quartz调度器的计划任务
* *
* @param job 调度信息 * @param job 调度信息
* @return 调度任务集合 * @return 调度任务集合
*/ */
public List<SysJob> selectJobList(SysJob job); public List<Job> selectJobList(Job job);
/** /**
* 通过调度任务ID查询调度信息 * 通过调度任务ID查询调度信息
@ -26,7 +26,7 @@ public interface ISysJobService {
* @param jobId 调度任务ID * @param jobId 调度任务ID
* @return 调度任务对象信息 * @return 调度任务对象信息
*/ */
public SysJob selectJobById(Long jobId); public Job selectJobById(Long jobId);
/** /**
* 暂停任务 * 暂停任务
@ -34,7 +34,7 @@ public interface ISysJobService {
* @param job 调度信息 * @param job 调度信息
* @return 结果 * @return 结果
*/ */
public int pauseJob(SysJob job) throws SchedulerException; public int pauseJob(Job job) throws SchedulerException;
/** /**
* 恢复任务 * 恢复任务
@ -42,7 +42,7 @@ public interface ISysJobService {
* @param job 调度信息 * @param job 调度信息
* @return 结果 * @return 结果
*/ */
public int resumeJob(SysJob job) throws SchedulerException; public int resumeJob(Job job) throws SchedulerException;
/** /**
* 删除任务后，所对应的trigger也将被删除 * 删除任务后，所对应的trigger也将被删除
@ -50,7 +50,7 @@ public interface ISysJobService {
* @param job 调度信息 * @param job 调度信息
* @return 结果 * @return 结果
*/ */
public int deleteJob(SysJob job) throws SchedulerException; public int deleteJob(Job job) throws SchedulerException;
/** /**
* 批量删除调度信息 * 批量删除调度信息
@ -66,7 +66,7 @@ public interface ISysJobService {
* @param job 调度信息 * @param job 调度信息
* @return 结果 * @return 结果
*/ */
public int changeStatus(SysJob job) throws SchedulerException; public int changeStatus(Job job) throws SchedulerException;
/** /**
* 立即运行任务 * 立即运行任务
@ -74,7 +74,7 @@ public interface ISysJobService {
* @param job 调度信息 * @param job 调度信息
* @return 结果 * @return 结果
*/ */
public void run(SysJob job) throws SchedulerException; public void run(Job job) throws SchedulerException;
/** /**
* 新增任务 * 新增任务
@ -82,7 +82,7 @@ public interface ISysJobService {
* @param job 调度信息 * @param job 调度信息
* @return 结果 * @return 结果
*/ */
public int insertJob(SysJob job) throws SchedulerException, TaskException; public int insertJob(Job job) throws SchedulerException, TaskException;
/** /**
* 更新任务 * 更新任务
@ -90,7 +90,7 @@ public interface ISysJobService {
* @param job 调度信息 * @param job 调度信息
* @return 结果 * @return 结果
*/ */
public int updateJob(SysJob job) throws SchedulerException, TaskException; public int updateJob(Job job) throws SchedulerException, TaskException;
/** /**
* 校验cron表达式是否有效 * 校验cron表达式是否有效

16
hchyun/hchyun-quartz/src/main/java/com/hchyun/quartz/service/impl/SysJobLogServiceImpl.java → hchyun/hchyun-quartz/src/main/java/com/hchyun/quartz/service/impl/JobLogServiceImpl.java
View File

@ -4,9 +4,9 @@ import java.util.List;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import com.hchyun.quartz.entity.SysJobLog; import com.hchyun.quartz.entity.JobLog;
import com.hchyun.quartz.dao.SysJobLogDao; import com.hchyun.quartz.dao.JobLogDao;
import com.hchyun.quartz.service.ISysJobLogService; import com.hchyun.quartz.service.JobLogService;
/** /**
* 定时任务调度日志信息 服务层 * 定时任务调度日志信息 服务层
@ -14,9 +14,9 @@ import com.hchyun.quartz.service.ISysJobLogService;
* @author hchyun * @author hchyun
*/ */
@Service @Service
public class SysJobLogServiceImpl implements ISysJobLogService { public class JobLogServiceImpl implements JobLogService {
@Autowired @Autowired
private SysJobLogDao jobLogMapper; private JobLogDao jobLogMapper;
/** /**
* 获取quartz调度器日志的计划任务 * 获取quartz调度器日志的计划任务
@ -25,7 +25,7 @@ public class SysJobLogServiceImpl implements ISysJobLogService {
* @return 调度任务日志集合 * @return 调度任务日志集合
*/ */
@Override @Override
public List<SysJobLog> selectJobLogList(SysJobLog jobLog) { public List<JobLog> selectJobLogList(JobLog jobLog) {
return jobLogMapper.selectJobLogList(jobLog); return jobLogMapper.selectJobLogList(jobLog);
} }
@ -36,7 +36,7 @@ public class SysJobLogServiceImpl implements ISysJobLogService {
* @return 调度任务日志对象信息 * @return 调度任务日志对象信息
*/ */
@Override @Override
public SysJobLog selectJobLogById(Long jobLogId) { public JobLog selectJobLogById(Long jobLogId) {
return jobLogMapper.selectJobLogById(jobLogId); return jobLogMapper.selectJobLogById(jobLogId);
} }
@ -46,7 +46,7 @@ public class SysJobLogServiceImpl implements ISysJobLogService {
* @param jobLog 调度日志信息 * @param jobLog 调度日志信息
*/ */
@Override @Override
public void addJobLog(SysJobLog jobLog) { public void addJobLog(JobLog jobLog) {
jobLogMapper.insertJobLog(jobLog); jobLogMapper.insertJobLog(jobLog);
} }

40
hchyun/hchyun-quartz/src/main/java/com/hchyun/quartz/service/impl/SysJobServiceImpl.java → hchyun/hchyun-quartz/src/main/java/com/hchyun/quartz/service/impl/JobServiceImpl.java
View File

@ -12,9 +12,9 @@ import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import com.hchyun.common.constant.ScheduleConstants; import com.hchyun.common.constant.ScheduleConstants;
import com.hchyun.common.exception.job.TaskException; import com.hchyun.common.exception.job.TaskException;
import com.hchyun.quartz.entity.SysJob; import com.hchyun.quartz.entity.Job;
import com.hchyun.quartz.dao.SysJobDao; import com.hchyun.quartz.dao.JobDao;
import com.hchyun.quartz.service.ISysJobService; import com.hchyun.quartz.service.JobService;
import com.hchyun.quartz.util.CronUtils; import com.hchyun.quartz.util.CronUtils;
import com.hchyun.quartz.util.ScheduleUtils; import com.hchyun.quartz.util.ScheduleUtils;
@ -24,12 +24,12 @@ import com.hchyun.quartz.util.ScheduleUtils;
* @author hchyun * @author hchyun
*/ */
@Service @Service
public class SysJobServiceImpl implements ISysJobService { public class JobServiceImpl implements JobService {
@Autowired @Autowired
private Scheduler scheduler; private Scheduler scheduler;
@Autowired @Autowired
private SysJobDao jobMapper; private JobDao jobMapper;
/** /**
* 项目启动时，初始化定时器 主要是防止手动修改数据库导致未同步到定时任务处理（注：不能手动修改数据库ID和任务组名，否则会导致脏数据） * 项目启动时，初始化定时器 主要是防止手动修改数据库导致未同步到定时任务处理（注：不能手动修改数据库ID和任务组名，否则会导致脏数据）
@ -37,8 +37,8 @@ public class SysJobServiceImpl implements ISysJobService {
@PostConstruct @PostConstruct
public void init() throws SchedulerException, TaskException { public void init() throws SchedulerException, TaskException {
scheduler.clear(); scheduler.clear();
List<SysJob> jobList = jobMapper.selectJobAll(); List<Job> jobList = jobMapper.selectJobAll();
for (SysJob job : jobList) { for (Job job : jobList) {
ScheduleUtils.createScheduleJob(scheduler, job); ScheduleUtils.createScheduleJob(scheduler, job);
} }
} }
@ -50,7 +50,7 @@ public class SysJobServiceImpl implements ISysJobService {
* @return * @return
*/ */
@Override @Override
public List<SysJob> selectJobList(SysJob job) { public List<Job> selectJobList(Job job) {
return jobMapper.selectJobList(job); return jobMapper.selectJobList(job);
} }
@ -61,7 +61,7 @@ public class SysJobServiceImpl implements ISysJobService {
* @return 调度任务对象信息 * @return 调度任务对象信息
*/ */
@Override @Override
public SysJob selectJobById(Long jobId) { public Job selectJobById(Long jobId) {
return jobMapper.selectJobById(jobId); return jobMapper.selectJobById(jobId);
} }
@ -72,7 +72,7 @@ public class SysJobServiceImpl implements ISysJobService {
*/ */
@Override @Override
@Transactional @Transactional
public int pauseJob(SysJob job) throws SchedulerException { public int pauseJob(Job job) throws SchedulerException {
Long jobId = job.getJobId(); Long jobId = job.getJobId();
String jobGroup = job.getJobGroup(); String jobGroup = job.getJobGroup();
job.setStatus(ScheduleConstants.Status.PAUSE.getValue()); job.setStatus(ScheduleConstants.Status.PAUSE.getValue());
@ -90,7 +90,7 @@ public class SysJobServiceImpl implements ISysJobService {
*/ */
@Override @Override
@Transactional @Transactional
public int resumeJob(SysJob job) throws SchedulerException { public int resumeJob(Job job) throws SchedulerException {
Long jobId = job.getJobId(); Long jobId = job.getJobId();
String jobGroup = job.getJobGroup(); String jobGroup = job.getJobGroup();
job.setStatus(ScheduleConstants.Status.NORMAL.getValue()); job.setStatus(ScheduleConstants.Status.NORMAL.getValue());
@ -108,7 +108,7 @@ public class SysJobServiceImpl implements ISysJobService {
*/ */
@Override @Override
@Transactional @Transactional
public int deleteJob(SysJob job) throws SchedulerException { public int deleteJob(Job job) throws SchedulerException {
Long jobId = job.getJobId(); Long jobId = job.getJobId();
String jobGroup = job.getJobGroup(); String jobGroup = job.getJobGroup();
int rows = jobMapper.deleteJobById(jobId); int rows = jobMapper.deleteJobById(jobId);
@ -128,7 +128,7 @@ public class SysJobServiceImpl implements ISysJobService {
@Transactional @Transactional
public void deleteJobByIds(Long[] jobIds) throws SchedulerException { public void deleteJobByIds(Long[] jobIds) throws SchedulerException {
for (Long jobId : jobIds) { for (Long jobId : jobIds) {
SysJob job = jobMapper.selectJobById(jobId); Job job = jobMapper.selectJobById(jobId);
deleteJob(job); deleteJob(job);
} }
} }
@ -140,7 +140,7 @@ public class SysJobServiceImpl implements ISysJobService {
*/ */
@Override @Override
@Transactional @Transactional
public int changeStatus(SysJob job) throws SchedulerException { public int changeStatus(Job job) throws SchedulerException {
int rows = 0; int rows = 0;
String status = job.getStatus(); String status = job.getStatus();
if (ScheduleConstants.Status.NORMAL.getValue().equals(status)) { if (ScheduleConstants.Status.NORMAL.getValue().equals(status)) {
@ -158,10 +158,10 @@ public class SysJobServiceImpl implements ISysJobService {
*/ */
@Override @Override
@Transactional @Transactional
public void run(SysJob job) throws SchedulerException { public void run(Job job) throws SchedulerException {
Long jobId = job.getJobId(); Long jobId = job.getJobId();
String jobGroup = job.getJobGroup(); String jobGroup = job.getJobGroup();
SysJob properties = selectJobById(job.getJobId()); Job properties = selectJobById(job.getJobId());
// 参数 // 参数
JobDataMap dataMap = new JobDataMap(); JobDataMap dataMap = new JobDataMap();
dataMap.put(ScheduleConstants.TASK_PROPERTIES, properties); dataMap.put(ScheduleConstants.TASK_PROPERTIES, properties);
@ -175,7 +175,7 @@ public class SysJobServiceImpl implements ISysJobService {
*/ */
@Override @Override
@Transactional @Transactional
public int insertJob(SysJob job) throws SchedulerException, TaskException { public int insertJob(Job job) throws SchedulerException, TaskException {
job.setStatus(ScheduleConstants.Status.PAUSE.getValue()); job.setStatus(ScheduleConstants.Status.PAUSE.getValue());
int rows = jobMapper.insertJob(job); int rows = jobMapper.insertJob(job);
if (rows > 0) { if (rows > 0) {
@ -191,8 +191,8 @@ public class SysJobServiceImpl implements ISysJobService {
*/ */
@Override @Override
@Transactional @Transactional
public int updateJob(SysJob job) throws SchedulerException, TaskException { public int updateJob(Job job) throws SchedulerException, TaskException {
SysJob properties = selectJobById(job.getJobId()); Job properties = selectJobById(job.getJobId());
int rows = jobMapper.updateJob(job); int rows = jobMapper.updateJob(job);
if (rows > 0) { if (rows > 0) {
updateSchedulerJob(job, properties.getJobGroup()); updateSchedulerJob(job, properties.getJobGroup());
@ -206,7 +206,7 @@ public class SysJobServiceImpl implements ISysJobService {
* @param job 任务对象 * @param job 任务对象
* @param jobGroup 任务组名 * @param jobGroup 任务组名
*/ */
public void updateSchedulerJob(SysJob job, String jobGroup) throws SchedulerException, TaskException { public void updateSchedulerJob(Job job, String jobGroup) throws SchedulerException, TaskException {
Long jobId = job.getJobId(); Long jobId = job.getJobId();
// 判断是否存在 // 判断是否存在
JobKey jobKey = ScheduleUtils.getJobKey(jobId, jobGroup); JobKey jobKey = ScheduleUtils.getJobKey(jobId, jobGroup);

59
hchyun/hchyun-quartz/src/main/java/com/hchyun/quartz/util/AbstractQuartzJob.java
View File

@ -2,7 +2,6 @@ package com.hchyun.quartz.util;
import java.util.Date; import java.util.Date;
import org.quartz.Job;
import org.quartz.JobExecutionContext; import org.quartz.JobExecutionContext;
import org.quartz.JobExecutionException; import org.quartz.JobExecutionException;
import org.slf4j.Logger; import org.slf4j.Logger;
@ -13,16 +12,16 @@ import com.hchyun.common.utils.ExceptionUtil;
import com.hchyun.common.utils.StringUtils; import com.hchyun.common.utils.StringUtils;
import com.hchyun.common.utils.bean.BeanUtils; import com.hchyun.common.utils.bean.BeanUtils;
import com.hchyun.common.utils.spring.SpringUtils; import com.hchyun.common.utils.spring.SpringUtils;
import com.hchyun.quartz.entity.SysJob; import com.hchyun.quartz.entity.Job;
import com.hchyun.quartz.entity.SysJobLog; import com.hchyun.quartz.entity.JobLog;
import com.hchyun.quartz.service.ISysJobLogService; import com.hchyun.quartz.service.JobLogService;
/** /**
* 抽象quartz调用 * 抽象quartz调用
* *
* @author hchyun * @author hchyun
*/ */
public abstract class AbstractQuartzJob implements Job { public abstract class AbstractQuartzJob implements org.quartz.Job {
private static final Logger log = LoggerFactory.getLogger(AbstractQuartzJob.class); private static final Logger log = LoggerFactory.getLogger(AbstractQuartzJob.class);
/** /**
@ -32,17 +31,17 @@ public abstract class AbstractQuartzJob implements Job {
@Override @Override
public void execute(JobExecutionContext context) throws JobExecutionException { public void execute(JobExecutionContext context) throws JobExecutionException {
SysJob sysJob = new SysJob(); Job job = new Job();
BeanUtils.copyBeanProp(sysJob, context.getMergedJobDataMap().get(ScheduleConstants.TASK_PROPERTIES)); BeanUtils.copyBeanProp(job, context.getMergedJobDataMap().get(ScheduleConstants.TASK_PROPERTIES));
try { try {
before(context, sysJob); before(context, job);
if (sysJob != null) { if (job != null) {
doExecute(context, sysJob); doExecute(context, job);
} }
after(context, sysJob, null); after(context, job, null);
} catch (Exception e) { } catch (Exception e) {
log.error("任务执行异常 - ：", e); log.error("任务执行异常 - ：", e);
after(context, sysJob, e); after(context, job, e);
} }
} }
@ -50,9 +49,9 @@ public abstract class AbstractQuartzJob implements Job {
* 执行前 * 执行前
* *
* @param context 工作执行上下文对象 * @param context 工作执行上下文对象
* @param sysJob 系统计划任务 * @param job 系统计划任务
*/ */
protected void before(JobExecutionContext context, SysJob sysJob) { protected void before(JobExecutionContext context, Job job) {
threadLocal.set(new Date()); threadLocal.set(new Date());
} }
@ -60,38 +59,38 @@ public abstract class AbstractQuartzJob implements Job {
* 执行后 * 执行后
* *
* @param context 工作执行上下文对象 * @param context 工作执行上下文对象
* @param sysJob 系统计划任务 * @param job 系统计划任务
*/ */
protected void after(JobExecutionContext context, SysJob sysJob, Exception e) { protected void after(JobExecutionContext context, Job job, Exception e) {
Date startTime = threadLocal.get(); Date startTime = threadLocal.get();
threadLocal.remove(); threadLocal.remove();
final SysJobLog sysJobLog = new SysJobLog(); final JobLog jobLog = new JobLog();
sysJobLog.setJobName(sysJob.getJobName()); jobLog.setJobName(job.getJobName());
sysJobLog.setJobGroup(sysJob.getJobGroup()); jobLog.setJobGroup(job.getJobGroup());
sysJobLog.setInvokeTarget(sysJob.getInvokeTarget()); jobLog.setInvokeTarget(job.getInvokeTarget());
sysJobLog.setStartTime(startTime); jobLog.setStartTime(startTime);
sysJobLog.setStopTime(new Date()); jobLog.setStopTime(new Date());
long runMs = sysJobLog.getStopTime().getTime() - sysJobLog.getStartTime().getTime(); long runMs = jobLog.getStopTime().getTime() - jobLog.getStartTime().getTime();
sysJobLog.setJobMessage(sysJobLog.getJobName() + " 总共耗时：" + runMs + "毫秒"); jobLog.setJobMessage(jobLog.getJobName() + " 总共耗时：" + runMs + "毫秒");
if (e != null) { if (e != null) {
sysJobLog.setStatus(Constants.FAIL); jobLog.setStatus(Constants.FAIL);
String errorMsg = StringUtils.substring(ExceptionUtil.getExceptionMessage(e), 0, 2000); String errorMsg = StringUtils.substring(ExceptionUtil.getExceptionMessage(e), 0, 2000);
sysJobLog.setExceptionInfo(errorMsg); jobLog.setExceptionInfo(errorMsg);
} else { } else {
sysJobLog.setStatus(Constants.SUCCESS); jobLog.setStatus(Constants.SUCCESS);
} }
// 写入数据库当中 // 写入数据库当中
SpringUtils.getBean(ISysJobLogService.class).addJobLog(sysJobLog); SpringUtils.getBean(JobLogService.class).addJobLog(jobLog);
} }
/** /**
* 执行方法，由子类重载 * 执行方法，由子类重载
* *
* @param context 工作执行上下文对象 * @param context 工作执行上下文对象
* @param sysJob 系统计划任务 * @param job 系统计划任务
* @throws Exception 执行过程中的异常 * @throws Exception 执行过程中的异常
*/ */
protected abstract void doExecute(JobExecutionContext context, SysJob sysJob) throws Exception; protected abstract void doExecute(JobExecutionContext context, Job job) throws Exception;
} }

8
hchyun/hchyun-quartz/src/main/java/com/hchyun/quartz/util/JobInvokeUtil.java
View File

@ -7,7 +7,7 @@ import java.util.List;
import com.hchyun.common.utils.StringUtils; import com.hchyun.common.utils.StringUtils;
import com.hchyun.common.utils.spring.SpringUtils; import com.hchyun.common.utils.spring.SpringUtils;
import com.hchyun.quartz.entity.SysJob; import com.hchyun.quartz.entity.Job;
/** /**
* 任务执行工具 * 任务执行工具
@ -18,10 +18,10 @@ public class JobInvokeUtil {
/** /**
* 执行方法 * 执行方法
* *
* @param sysJob 系统任务 * @param job 系统任务
*/ */
public static void invokeMethod(SysJob sysJob) throws Exception { public static void invokeMethod(Job job) throws Exception {
String invokeTarget = sysJob.getInvokeTarget(); String invokeTarget = job.getInvokeTarget();
String beanName = getBeanName(invokeTarget); String beanName = getBeanName(invokeTarget);
String methodName = getMethodName(invokeTarget); String methodName = getMethodName(invokeTarget);
List<Object[]> methodParams = getMethodParams(invokeTarget); List<Object[]> methodParams = getMethodParams(invokeTarget);

6
hchyun/hchyun-quartz/src/main/java/com/hchyun/quartz/util/QuartzDisallowConcurrentExecution.java
View File

@ -2,7 +2,7 @@ package com.hchyun.quartz.util;
import org.quartz.DisallowConcurrentExecution; import org.quartz.DisallowConcurrentExecution;
import org.quartz.JobExecutionContext; import org.quartz.JobExecutionContext;
import com.hchyun.quartz.entity.SysJob; import com.hchyun.quartz.entity.Job;
/** /**
* 定时任务处理（禁止并发执行） * 定时任务处理（禁止并发执行）
@ -12,7 +12,7 @@ import com.hchyun.quartz.entity.SysJob;
@DisallowConcurrentExecution @DisallowConcurrentExecution
public class QuartzDisallowConcurrentExecution extends AbstractQuartzJob { public class QuartzDisallowConcurrentExecution extends AbstractQuartzJob {
@Override @Override
protected void doExecute(JobExecutionContext context, SysJob sysJob) throws Exception { protected void doExecute(JobExecutionContext context, Job job) throws Exception {
JobInvokeUtil.invokeMethod(sysJob); JobInvokeUtil.invokeMethod(job);
} }
} }

6
hchyun/hchyun-quartz/src/main/java/com/hchyun/quartz/util/QuartzJobExecution.java
View File

@ -1,7 +1,7 @@
package com.hchyun.quartz.util; package com.hchyun.quartz.util;
import org.quartz.JobExecutionContext; import org.quartz.JobExecutionContext;
import com.hchyun.quartz.entity.SysJob; import com.hchyun.quartz.entity.Job;
/** /**
* 定时任务处理（允许并发执行） * 定时任务处理（允许并发执行）
@ -10,7 +10,7 @@ import com.hchyun.quartz.entity.SysJob;
*/ */
public class QuartzJobExecution extends AbstractQuartzJob { public class QuartzJobExecution extends AbstractQuartzJob {
@Override @Override
protected void doExecute(JobExecutionContext context, SysJob sysJob) throws Exception { protected void doExecute(JobExecutionContext context, Job job) throws Exception {
JobInvokeUtil.invokeMethod(sysJob); JobInvokeUtil.invokeMethod(job);
} }
} }

15
hchyun/hchyun-quartz/src/main/java/com/hchyun/quartz/util/ScheduleUtils.java
View File

@ -2,7 +2,6 @@ package com.hchyun.quartz.util;
import org.quartz.CronScheduleBuilder; import org.quartz.CronScheduleBuilder;
import org.quartz.CronTrigger; import org.quartz.CronTrigger;
import org.quartz.Job;
import org.quartz.JobBuilder; import org.quartz.JobBuilder;
import org.quartz.JobDetail; import org.quartz.JobDetail;
import org.quartz.JobKey; import org.quartz.JobKey;
@ -13,7 +12,7 @@ import org.quartz.TriggerKey;
import com.hchyun.common.constant.ScheduleConstants; import com.hchyun.common.constant.ScheduleConstants;
import com.hchyun.common.exception.job.TaskException; import com.hchyun.common.exception.job.TaskException;
import com.hchyun.common.exception.job.TaskException.Code; import com.hchyun.common.exception.job.TaskException.Code;
import com.hchyun.quartz.entity.SysJob; import com.hchyun.quartz.entity.Job;
/** /**
* 定时任务工具类 * 定时任务工具类
@ -24,11 +23,11 @@ public class ScheduleUtils {
/** /**
* 得到quartz任务类 * 得到quartz任务类
* *
* @param sysJob 执行计划 * @param job 执行计划
* @return 具体执行任务类 * @return 具体执行任务类
*/ */
private static Class<? extends Job> getQuartzJobClass(SysJob sysJob) { private static Class<? extends org.quartz.Job> getQuartzJobClass(Job job) {
boolean isConcurrent = "0".equals(sysJob.getConcurrent()); boolean isConcurrent = "0".equals(job.getConcurrent());
return isConcurrent ? QuartzJobExecution.class : QuartzDisallowConcurrentExecution.class; return isConcurrent ? QuartzJobExecution.class : QuartzDisallowConcurrentExecution.class;
} }
@ -49,8 +48,8 @@ public class ScheduleUtils {
/** /**
* 创建定时任务 * 创建定时任务
*/ */
public static void createScheduleJob(Scheduler scheduler, SysJob job) throws SchedulerException, TaskException { public static void createScheduleJob(Scheduler scheduler, Job job) throws SchedulerException, TaskException {
Class<? extends Job> jobClass = getQuartzJobClass(job); Class<? extends org.quartz.Job> jobClass = getQuartzJobClass(job);
// 构建job信息 // 构建job信息
Long jobId = job.getJobId(); Long jobId = job.getJobId();
String jobGroup = job.getJobGroup(); String jobGroup = job.getJobGroup();
@ -84,7 +83,7 @@ public class ScheduleUtils {
/** /**
* 设置定时任务策略 * 设置定时任务策略
*/ */
public static CronScheduleBuilder handleCronScheduleMisfirePolicy(SysJob job, CronScheduleBuilder cb) public static CronScheduleBuilder handleCronScheduleMisfirePolicy(Job job, CronScheduleBuilder cb)
throws TaskException { throws TaskException {
switch (job.getMisfirePolicy()) { switch (job.getMisfirePolicy()) {
case ScheduleConstants.MISFIRE_DEFAULT: case ScheduleConstants.MISFIRE_DEFAULT:

12
hchyun/hchyun-quartz/src/main/resources/mapper/quartz/SysJobLogMapper.xml → hchyun/hchyun-quartz/src/main/resources/mapper/quartz/JobLogMapper.xml
View File

@ -2,9 +2,9 @@
<!DOCTYPE mapper <!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd"> "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.hchyun.quartz.dao.SysJobLogDao"> <mapper namespace="com.hchyun.quartz.dao.JobLogDao">
<resultMap type="SysJobLog" id="SysJobLogResult"> <resultMap type="JobLog" id="JobLogResult">
<id property="jobLogId" column="job_log_id" /> <id property="jobLogId" column="job_log_id" />
<result property="jobName" column="job_name" /> <result property="jobName" column="job_name" />
<result property="jobGroup" column="job_group" /> <result property="jobGroup" column="job_group" />
@ -20,7 +20,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
from sys_job_log from sys_job_log
</sql> </sql>
<select id="selectJobLogList" parameterType="SysJobLog" resultMap="SysJobLogResult"> <select id="selectJobLogList" parameterType="JobLog" resultMap="JobLogResult">
<include refid="selectJobLogVo"/> <include refid="selectJobLogVo"/>
<where> <where>
<if test="jobName != null and jobName != ''"> <if test="jobName != null and jobName != ''">
@ -44,11 +44,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</where> </where>
</select> </select>
<select id="selectJobLogAll" resultMap="SysJobLogResult"> <select id="selectJobLogAll" resultMap="JobLogResult">
<include refid="selectJobLogVo"/> <include refid="selectJobLogVo"/>
</select> </select>
<select id="selectJobLogById" parameterType="Long" resultMap="SysJobLogResult"> <select id="selectJobLogById" parameterType="Long" resultMap="JobLogResult">
<include refid="selectJobLogVo"/> <include refid="selectJobLogVo"/>
where job_log_id = #{jobLogId} where job_log_id = #{jobLogId}
</select> </select>
@ -68,7 +68,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
truncate table sys_job_log truncate table sys_job_log
</update> </update>
<insert id="insertJobLog" parameterType="SysJobLog"> <insert id="insertJobLog" parameterType="JobLog">
insert into sys_job_log( insert into sys_job_log(
<if test="jobLogId != null and jobLogId != 0">job_log_id,</if> <if test="jobLogId != null and jobLogId != 0">job_log_id,</if>
<if test="jobName != null and jobName != ''">job_name,</if> <if test="jobName != null and jobName != ''">job_name,</if>

14
hchyun/hchyun-quartz/src/main/resources/mapper/quartz/SysJobMapper.xml → hchyun/hchyun-quartz/src/main/resources/mapper/quartz/JobMapper.xml
View File

@ -2,9 +2,9 @@
<!DOCTYPE mapper <!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd"> "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.hchyun.quartz.dao.SysJobDao"> <mapper namespace="com.hchyun.quartz.dao.JobDao">
<resultMap type="SysJob" id="SysJobResult"> <resultMap type="Job" id="JobResult">
<id property="jobId" column="job_id" /> <id property="jobId" column="job_id" />
<result property="jobName" column="job_name" /> <result property="jobName" column="job_name" />
<result property="jobGroup" column="job_group" /> <result property="jobGroup" column="job_group" />
@ -25,7 +25,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
from sys_job from sys_job
</sql> </sql>
<select id="selectJobList" parameterType="SysJob" resultMap="SysJobResult"> <select id="selectJobList" parameterType="Job" resultMap="JobResult">
<include refid="selectJobVo"/> <include refid="selectJobVo"/>
<where> <where>
<if test="jobName != null and jobName != ''"> <if test="jobName != null and jobName != ''">
@ -43,11 +43,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</where> </where>
</select> </select>
<select id="selectJobAll" resultMap="SysJobResult"> <select id="selectJobAll" resultMap="JobResult">
<include refid="selectJobVo"/> <include refid="selectJobVo"/>
</select> </select>
<select id="selectJobById" parameterType="Long" resultMap="SysJobResult"> <select id="selectJobById" parameterType="Long" resultMap="JobResult">
<include refid="selectJobVo"/> <include refid="selectJobVo"/>
where job_id = #{jobId} where job_id = #{jobId}
</select> </select>
@ -63,7 +63,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</foreach> </foreach>
</delete> </delete>
<update id="updateJob" parameterType="SysJob"> <update id="updateJob" parameterType="Job">
update sys_job update sys_job
<set> <set>
<if test="jobName != null and jobName != ''">job_name = #{jobName},</if> <if test="jobName != null and jobName != ''">job_name = #{jobName},</if>
@ -80,7 +80,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
where job_id = #{jobId} where job_id = #{jobId}
</update> </update>
<insert id="insertJob" parameterType="SysJob" useGeneratedKeys="true" keyProperty="jobId"> <insert id="insertJob" parameterType="Job" useGeneratedKeys="true" keyProperty="jobId">
insert into sys_job( insert into sys_job(
<if test="jobId != null and jobId != 0">job_id,</if> <if test="jobId != null and jobId != 0">job_id,</if>
<if test="jobName != null and jobName != ''">job_name,</if> <if test="jobName != null and jobName != ''">job_name,</if>

2
hchyun/hchyun-test/src/main/java/com/hchyun/test/test/Maptest.java
View File

@ -1,7 +1,5 @@
package com.hchyun.test.test; package com.hchyun.test.test;
import org.apache.poi.ss.formula.functions.T;
import java.beans.BeanInfo; import java.beans.BeanInfo;
import java.beans.Introspector; import java.beans.Introspector;
import java.beans.PropertyDescriptor; import java.beans.PropertyDescriptor;