فهرست منبع

错误时的返回方法扩展

Progr1mmer 6 سال پیش
والد
کامیت
67680afc8e
16فایلهای تغییر یافته به همراه35 افزوده شده و 20 حذف شده
  1. 11 4
      common/common-rest-model/src/main/java/com/yihu/jw/restmodel/web/endpoint/EnvelopRestEndpoint.java
  2. 8 0
      common/common-util/pom.xml
  3. 1 1
      svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/function/FunctionEndpoint.java
  4. 1 1
      svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/module/ModuleEndpoint.java
  5. 1 1
      svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/module/ModuleFunctionEndpoint.java
  6. 1 1
      svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/role/RoleEndpoint.java
  7. 1 1
      svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/role/RoleModuleFunctionEndpoint.java
  8. 1 1
      svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/saas/SaasDefaultModuleEndpoint.java
  9. 3 3
      svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/saas/SaasEndpoint.java
  10. 1 1
      svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/saas/SaasModuleEndpoint.java
  11. 1 1
      svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/system/SystemDictEndpoint.java
  12. 1 1
      svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/system/SystemDictEntryEndpoint.java
  13. 1 1
      svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/theme/ThemeEndpoint.java
  14. 1 1
      svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/user/UserEndpoint.java
  15. 1 1
      svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/user/UserHideModuleFunctionEndpoint.java
  16. 1 1
      svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/user/UserRoleEndpoint.java

+ 11 - 4
common/common-rest-model/src/main/java/com/yihu/jw/restmodel/web/endpoint/EnvelopRestEndpoint.java

@ -119,12 +119,19 @@ public abstract class EnvelopRestEndpoint {
        return mixEnvelop;
    }
    protected Envelop failed(String message) {
        return failed(message, -10000);
    protected <E extends Envelop> Envelop failed(String message, Class<E> clazz) {
        return failed(message, -10000, clazz);
    }
    protected Envelop failed(String message, int status) {
        return success(message, status);
    protected <E extends Envelop> Envelop failed(String message, int status, Class<E> clazz) {
        try {
            E envelop = clazz.newInstance();
            envelop.setMessage(message);
            envelop.setStatus(status);
            return envelop;
        } catch (Exception e) {
            return null;
        }
    }
    protected <T> T toEntity(String json, Class<T> target) throws IOException {

+ 8 - 0
common/common-util/pom.xml

@ -19,6 +19,10 @@
            <groupId>org.springframework</groupId>
            <artifactId>spring-core</artifactId>
        </dependency>
        <dependency>
            <groupId>org.springframework</groupId>
            <artifactId>spring-context</artifactId>
        </dependency>
        <dependency>
            <groupId>com.github.stuxuhai</groupId>
            <artifactId>jpinyin</artifactId>
@ -29,5 +33,9 @@
            <artifactId>json</artifactId>
            <version>${version.json}</version>
        </dependency>
        <dependency>
            <groupId>org.slf4j</groupId>
            <artifactId>slf4j-api</artifactId>
        </dependency>
    </dependencies>
</project>

+ 1 - 1
svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/function/FunctionEndpoint.java

@ -54,7 +54,7 @@ public class FunctionEndpoint extends EnvelopRestEndpoint {
            @RequestBody String jsonData) throws Exception {
        FunctionDO functionDO = toEntity(jsonData, FunctionDO.class);
        if (null == functionDO.getId()) {
            return failed("ID不能为空");
            return failed("ID不能为空", Envelop.class);
        }
        functionDO = functionService.save(functionDO);
        return success(functionDO);

+ 1 - 1
svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/module/ModuleEndpoint.java

@ -54,7 +54,7 @@ public class ModuleEndpoint extends EnvelopRestEndpoint {
            @RequestBody String jsonData) throws Exception {
        ModuleDO module = toEntity(jsonData, ModuleDO.class);
        if (null == module.getId()) {
            return failed("ID不能为空");
            return failed("ID不能为空", Envelop.class);
        }
        module = moduleService.save(module);
        return success(module);

+ 1 - 1
svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/module/ModuleFunctionEndpoint.java

@ -54,7 +54,7 @@ public class ModuleFunctionEndpoint extends EnvelopRestEndpoint {
            @RequestBody String jsonData) throws Exception {
        ModuleFunctionDO moduleFunctionDO = toEntity(jsonData, ModuleFunctionDO.class);
        if (null == moduleFunctionDO.getId()) {
            return failed("ID不能为空");
            return failed("ID不能为空", Envelop.class);
        }
        moduleFunctionDO = moduleFunctionService.save(moduleFunctionDO);
        return success(moduleFunctionDO);

+ 1 - 1
svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/role/RoleEndpoint.java

@ -54,7 +54,7 @@ public class RoleEndpoint extends EnvelopRestEndpoint {
            @RequestBody String jsonData) throws Exception {
        RoleDO roleDO = toEntity(jsonData, RoleDO.class);
        if (null == roleDO.getId()) {
            return failed("ID不能为空");
            return failed("ID不能为空", Envelop.class);
        }
        roleDO = roleService.save(roleDO);
        return success(roleDO);

+ 1 - 1
svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/role/RoleModuleFunctionEndpoint.java

@ -54,7 +54,7 @@ public class RoleModuleFunctionEndpoint extends EnvelopRestEndpoint {
            @RequestBody String jsonData) throws Exception {
        RoleModuleFunctionDO roleModuleFunctionDO = toEntity(jsonData, RoleModuleFunctionDO.class);
        if (null == roleModuleFunctionDO.getId()) {
            return failed("ID不能为空");
            return failed("ID不能为空", Envelop.class);
        }
        roleModuleFunctionDO = roleModuleFunctionService.save(roleModuleFunctionDO);
        return success(roleModuleFunctionDO);

+ 1 - 1
svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/saas/SaasDefaultModuleEndpoint.java

@ -54,7 +54,7 @@ public class SaasDefaultModuleEndpoint extends EnvelopRestEndpoint {
            @RequestBody String jsonData) throws Exception {
        SaasDefaultModuleDO saasDefaultModuleDO = toEntity(jsonData, SaasDefaultModuleDO.class);
        if (null == saasDefaultModuleDO.getId()) {
            return failed("ID不能为空");
            return failed("ID不能为空", Envelop.class);
        }
        saasDefaultModuleDO = saasDefaultModuleService.save(saasDefaultModuleDO);
        return success(saasDefaultModuleDO);

+ 3 - 3
svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/saas/SaasEndpoint.java

@ -41,7 +41,7 @@ public class SaasEndpoint extends EnvelopRestEndpoint {
            @ApiParam(name = "user", value = "Json数据", required = true)
            @RequestParam(value = "user") UserDO userDO) throws Exception {
        if (userService.search("username=" + userDO.getUsername()).size() > 0) {
            return failed("管理员用户名已存在");
            return failed("管理员用户名已存在", Envelop.class);
        }
        userDO.setEnabled(true);
        userDO.setLocked(false);
@ -69,7 +69,7 @@ public class SaasEndpoint extends EnvelopRestEndpoint {
            @RequestBody String jsonData) throws Exception {
        SaasDO saasDO = toEntity(jsonData, SaasDO.class);
        if (null == saasDO.getId()) {
            return failed("ID不能为空");
            return failed("ID不能为空", Envelop.class);
        }
        saasDO = saasService.save(saasDO);
        return success(saasDO);
@ -115,7 +115,7 @@ public class SaasEndpoint extends EnvelopRestEndpoint {
            @RequestParam(value = "status") SaasDO.Status status) throws Exception {
        SaasDO saasDO = saasService.retrieve(id);
        if (null == saasDO) {
            return failed("无相关SAAS配置");
            return failed("无相关SAAS配置", Envelop.class);
        }
        saasDO.setStatus(status);
        saasService.save(saasDO);

+ 1 - 1
svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/saas/SaasModuleEndpoint.java

@ -54,7 +54,7 @@ public class SaasModuleEndpoint extends EnvelopRestEndpoint {
            @RequestBody String jsonData) throws Exception {
        SaasModuleDO saasModuleDO = toEntity(jsonData, SaasModuleDO.class);
        if (null == saasModuleDO.getId()) {
            return failed("ID不能为空");
            return failed("ID不能为空", Envelop.class);
        }
        saasModuleDO = saasModuleService.save(saasModuleDO);
        return success(saasModuleDO);

+ 1 - 1
svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/system/SystemDictEndpoint.java

@ -54,7 +54,7 @@ public class SystemDictEndpoint extends EnvelopRestEndpoint {
            @RequestBody String jsonData) throws Exception {
        SystemDictDO systemDictDO = toEntity(jsonData, SystemDictDO.class);
        if (null == systemDictDO.getId()) {
            return failed("ID不能为空");
            return failed("ID不能为空", Envelop.class);
        }
        systemDictDO = systemDictService.save(systemDictDO);
        return success(systemDictDO);

+ 1 - 1
svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/system/SystemDictEntryEndpoint.java

@ -54,7 +54,7 @@ public class SystemDictEntryEndpoint extends EnvelopRestEndpoint {
            @RequestBody String jsonData) throws Exception {
        SystemDictEntryDO systemDictEntryDO = toEntity(jsonData, SystemDictEntryDO.class);
        if (null == systemDictEntryDO.getId()) {
            return failed("ID不能为空");
            return failed("ID不能为空", Envelop.class);
        }
        systemDictEntryDO = systemDictEntryService.save(systemDictEntryDO);
        return success(systemDictEntryDO);

+ 1 - 1
svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/theme/ThemeEndpoint.java

@ -54,7 +54,7 @@ public class ThemeEndpoint extends EnvelopRestEndpoint {
            @RequestBody String jsonData) throws Exception {
        ThemeDO theme = toEntity(jsonData, ThemeDO.class);
        if (null == theme.getId()) {
            return failed("ID不能为空");
            return failed("ID不能为空", Envelop.class);
        }
        theme = themeService.save(theme);
        return success(theme);

+ 1 - 1
svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/user/UserEndpoint.java

@ -54,7 +54,7 @@ public class UserEndpoint extends EnvelopRestEndpoint {
            @RequestBody String jsonData) throws Exception {
        UserDO userDO = toEntity(jsonData, UserDO.class);
        if (null == userDO.getId()) {
            return failed("ID不能为空");
            return failed("ID不能为空", Envelop.class);
        }
        userDO = userService.save(userDO);
        return success(userDO);

+ 1 - 1
svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/user/UserHideModuleFunctionEndpoint.java

@ -54,7 +54,7 @@ public class UserHideModuleFunctionEndpoint extends EnvelopRestEndpoint {
            @RequestBody String jsonData) throws Exception {
        UserHideModuleFunctionDO userHideModuleFunctionDO = toEntity(jsonData, UserHideModuleFunctionDO.class);
        if (null == userHideModuleFunctionDO.getId()) {
            return failed("ID不能为空");
            return failed("ID不能为空", Envelop.class);
        }
        userHideModuleFunctionDO = userHideModuleFunctionService.save(userHideModuleFunctionDO);
        return success(userHideModuleFunctionDO);

+ 1 - 1
svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/user/UserRoleEndpoint.java

@ -54,7 +54,7 @@ public class UserRoleEndpoint extends EnvelopRestEndpoint {
            @RequestBody String jsonData) throws Exception {
        UserRoleDO userRoleDO = toEntity(jsonData, UserRoleDO.class);
        if (null == userRoleDO.getId()) {
            return failed("ID不能为空");
            return failed("ID不能为空", Envelop.class);
        }
        userRoleDO = userRoleService.save(userRoleDO);
        return success(userRoleDO);