增加mybatisplus扩展service依赖

src/main/java/com/qmth/ops/api/controller/admin/AppController.java

@@ -39,8 +39,8 @@ public class AppController {
 
     @PostMapping("/version/master")
     public App updateMasterVersion(@RequestParam Long id, @RequestParam Long versionId) {
-        appService.setMasterVersion(appService.findById(id), versionService.findByid(versionId));
-        return appService.findById(id);
+        appService.setMasterVersion(appService.getById(id), versionService.getById(versionId));
+        return appService.getById(id);
     }
 }
 

src/main/java/com/qmth/ops/api/controller/admin/ConfigController.java

@@ -53,9 +53,9 @@ public class ConfigController {
     public Object updateBaseline(@RequestParam Long appId, @RequestParam Long versionId, @RequestParam Long moduleId,
             @RequestParam MultipartFile file, @RequestParam FileFormat extension,
             @RequestParam(required = false) Long inheritVersionId) throws IOException {
-        return configService.updateBaseline(appService.findById(appId), versionService.findByid(versionId),
-                moduleService.findById(moduleId), file.getInputStream(), extension,
-                inheritVersionId != null ? versionService.findByid(inheritVersionId) : null);
+        return configService.updateBaseline(appService.getById(appId), versionService.getById(versionId),
+                moduleService.getById(moduleId), file.getInputStream(), extension,
+                inheritVersionId != null ? versionService.getById(inheritVersionId) : null);
     }
 
     @PostMapping("/baseline/item/update")

src/main/java/com/qmth/ops/api/controller/admin/VersionController.java

@@ -29,7 +29,7 @@ public class VersionController {
 
     @PostMapping("/insert")
     public Version insert(@RequestParam Long appId, @RequestParam VersionNumber name) {
-        return versionService.insert(appService.findById(appId), name);
+        return versionService.insert(appService.getById(appId), name);
     }
 
     @PostMapping("/query")

src/main/java/com/qmth/ops/api/controller/export/ConfigExportController.java

@@ -83,7 +83,7 @@ public class ConfigExportController {
         Version version = versionNumber != null ?
                 versionService.findByAppAndNumber(app.getId(),
                         new VersionNumber(versionNumber.replaceAll("-", ".").replaceAll("_", "."))) :
-                versionService.findByid(app.getMasterVersionId());
+                versionService.getById(app.getMasterVersionId());
         if (version == null) {
             throw new ParameterException("version不存在");
         }

src/main/java/com/qmth/ops/api/security/AdminAuthorizationService.java

@@ -17,7 +17,7 @@ public class AdminAuthorizationService implements AuthorizationService<AdminSess
 
     @Override
     public AdminSession findByIdentity(String identity, SignatureType signatureType, String path) {
-        User user = userService.findById(Long.parseLong(identity));
+        User user = userService.getById(Long.parseLong(identity));
         if (user != null) {
             return new AdminSession(user);
         }

src/main/java/com/qmth/ops/biz/service/AppService.java

@@ -2,6 +2,7 @@ package com.qmth.ops.biz.service;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.qmth.boot.core.exception.ParameterException;
 import com.qmth.ops.biz.dao.AppDao;
 import com.qmth.ops.biz.domain.App;
@@ -14,7 +15,7 @@ import javax.annotation.Resource;
 import javax.validation.constraints.NotNull;
 
 @Service
-public class AppService {
+public class AppService extends ServiceImpl<AppDao, App> {
 
     @Resource
     private AppDao appDao;
@@ -43,10 +44,6 @@ public class AppService {
         return appDao.selectOne(new LambdaQueryWrapper<App>().eq(App::getCode, code));
     }
 
-    public App findById(Long id) {
-        return appDao.selectById(id);
-    }
-
     @Transactional
     public void setMasterVersion(@NotNull App app, @NotNull Version version) {
         if (!version.getAppId().equals(app.getId())) {

src/main/java/com/qmth/ops/biz/service/EnvService.java

@@ -2,6 +2,7 @@ package com.qmth.ops.biz.service;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.qmth.ops.biz.dao.EnvDao;
 import com.qmth.ops.biz.domain.Env;
 import org.springframework.stereotype.Service;
@@ -11,7 +12,7 @@ import javax.annotation.Resource;
 import java.util.List;
 
 @Service
-public class EnvService {
+public class EnvService extends ServiceImpl<EnvDao, Env> {
 
     @Resource
     private EnvDao envDao;

src/main/java/com/qmth/ops/biz/service/ModuleService.java

@@ -2,6 +2,7 @@ package com.qmth.ops.biz.service;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.qmth.ops.biz.dao.ModuleDao;
 import com.qmth.ops.biz.domain.Module;
 import com.qmth.ops.biz.query.ModuleQuery;
@@ -12,7 +13,7 @@ import javax.annotation.Resource;
 import java.util.List;
 
 @Service
-public class ModuleService {
+public class ModuleService extends ServiceImpl<ModuleDao, Module> {
 
     @Resource
     private ModuleDao moduleDao;
@@ -39,10 +40,6 @@ public class ModuleService {
         return moduleDao.selectList(query.build());
     }
 
-    public Module findById(Long id) {
-        return moduleDao.selectById(id);
-    }
-
     public Module findByAppAndCode(Long appId, String code) {
         return moduleDao
                 .selectOne(new LambdaQueryWrapper<Module>().eq(Module::getAppId, appId).eq(Module::getCode, code));

src/main/java/com/qmth/ops/biz/service/UserService.java

@@ -1,6 +1,7 @@
 package com.qmth.ops.biz.service;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.qmth.ops.biz.dao.UserDao;
 import com.qmth.ops.biz.domain.User;
 import com.qmth.ops.biz.query.UserQuery;
@@ -11,15 +12,11 @@ import org.springframework.transaction.annotation.Transactional;
 import javax.annotation.Resource;
 
 @Service
-public class UserService {
+public class UserService extends ServiceImpl<UserDao, User> {
 
     @Resource
     private UserDao userDao;
 
-    public User findById(Long id) {
-        return userDao.selectById(id);
-    }
-
     public User findByLoginName(String loginName) {
         return userDao.selectOne(new LambdaQueryWrapper<User>().eq(User::getLoginName, loginName));
     }

src/main/java/com/qmth/ops/biz/service/VersionService.java

@@ -2,6 +2,7 @@ package com.qmth.ops.biz.service;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.qmth.ops.biz.dao.VersionDao;
 import com.qmth.ops.biz.domain.App;
 import com.qmth.ops.biz.domain.Version;
@@ -14,7 +15,7 @@ import javax.annotation.Resource;
 import javax.validation.constraints.NotNull;
 
 @Service
-public class VersionService {
+public class VersionService extends ServiceImpl<VersionDao, Version> {
 
     @Resource
     private VersionDao versionDao;
@@ -46,10 +47,6 @@ public class VersionService {
         return versionDao.selectPage(query, query.build());
     }
 
-    public Version findByid(@NotNull Long id) {
-        return versionDao.selectById(id);
-    }
-
     public Version findByAppAndNumber(@NotNull Long appId, @NotNull VersionNumber number) {
         return versionDao.selectOne(new LambdaQueryWrapper<Version>().eq(Version::getAppId, appId)
                 .eq(Version::getMainNumber, number.getMain()).eq(Version::getMiddleNumber, number.getMiddle())