重构系统架构

opsli-base-support/opsli-common/pom.xml

@@ -3,9 +3,10 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>opsli-boot-parent</artifactId>
+        <artifactId>opsli-base-support</artifactId>
         <groupId>org.opsliframework.boot</groupId>
         <version>1.0.0</version>
+        <relativePath>../pom.xml</relativePath>
     </parent>
 
 

opsli-base-support/opsli-common/src/main/java/org/opsli/common/annotation/ApiRestController.java

@@ -8,7 +8,7 @@ import java.lang.annotation.*;
 
 /**
  * controller层统一使用该注解
- * @author C西
+ * @author Parker
  */
 @Target(ElementType.TYPE)
 @Retention(RetentionPolicy.RUNTIME)

opsli-base-support/opsli-common/src/main/java/org/opsli/common/annotation/EnableHotData.java

@@ -1,7 +1,5 @@
 package org.opsli.common.annotation;
 
-import org.opsli.common.constants.CacheConstants;
-
 import java.lang.annotation.*;
 
 /**
@@ -22,6 +20,8 @@ import java.lang.annotation.*;
  *
  * 用于 注解类 - 直接按照类开启 增 删 经过缓存
  *
+ * 并发更新 不建议使用 热数据 ☆☆☆☆☆
+ *
  */
 @Retention(RetentionPolicy.RUNTIME)
 @Target(ElementType.TYPE)

opsli-base-support/opsli-common/src/main/java/org/opsli/common/annotation/HotDataDel.java

@@ -18,6 +18,8 @@ import java.lang.annotation.*;
  *
  * 注意：不论是什么缓存，只要是缓存 就多少会有一致性的问题，针对不是那么重要的数据 且高频访问的数据可以缓存起来
  *
+ * 并发更新 不建议使用 热数据 ☆☆☆☆☆
+ *
  */
 @Retention(RetentionPolicy.RUNTIME)
 @Target(ElementType.METHOD)

opsli-base-support/opsli-common/src/main/java/org/opsli/common/annotation/HotDataPut.java

@@ -18,6 +18,8 @@ import java.lang.annotation.*;
  *
  * 注意：不论是什么缓存，只要是缓存 就多少会有一致性的问题，针对不是那么重要的数据 且高频访问的数据可以缓存起来
  *
+ * 并发更新 不建议使用 热数据 ☆☆☆☆☆
+ *
  */
 @Retention(RetentionPolicy.RUNTIME)
 @Target(ElementType.METHOD)

opsli-base-support/opsli-common/src/main/java/org/opsli/common/constants/MyBatisConstants.java

@@ -0,0 +1,38 @@
+package org.opsli.common.constants;
+
+import cn.hutool.setting.dialect.Props;
+
+/**
+ * @BelongsProject: opsli-boot
+ * @BelongsPackage: org.opsli.common.constants
+ * @Author: Parker
+ * @CreateTime: 2020-09-18 18:46
+ * @Description: MyBatis 常量
+ */
+public final class MyBatisConstants {
+
+    private static final Props prop = Props.getProp("application.yaml");
+
+    /** 逻辑删除值 */
+    public static final char  LOGIC_DELETE_VALUE =
+            prop.getChar("mybatis-plus.global-config.db-config.logic-delete-value",'1');
+    /** 逻辑不删除值 */
+    public static final char  LOGIC_NOT_DELETE_VALUE =
+            prop.getChar("mybatis-plus.global-config.db-config.logic-not-delete-value",'0');
+
+
+    /** 创建人 */
+    public static final String FIELD_CREATE_BY = "createBy";
+    /** 更新时间 */
+    public static final String FIELD_CREATE_TIME = "createTime";
+    /** 更新人 */
+    public static final String FIELD_UPDATE_BY = "updateBy";
+    /** 更新时间 */
+    public static final String FIELD_UPDATE_TIME = "updateTime";
+    /** 逻辑删除 */
+    public static final String FIELD_DELETE_LOGIC = "deleted";
+    /** 乐观锁 */
+    public static final String FIELD_OPTIMISTIC_LOCK = "version";
+
+    private MyBatisConstants(){}
+}

opsli-base-support/opsli-common/src/main/java/org/opsli/common/constants/OrderConstants.java

@@ -7,6 +7,9 @@ package org.opsli.common.constants;
  */
 public interface OrderConstants {
 
+    /** SQL 切面执行顺序 */
+    int SQL_ORDER = 190;
+
     /** 热点数据加载顺序 */
     int HOT_DATA_ORDER = 180;
 

opsli-base-support/opsli-common/src/main/java/org/opsli/common/utils/WrapperUtil.java

@@ -0,0 +1,105 @@
+package org.opsli.common.utils;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.ReflectUtil;
+import com.google.common.collect.Lists;
+import lombok.extern.slf4j.Slf4j;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @BelongsProject: opsli-boot
+ * @BelongsPackage: org.opsli.common.utils
+ * @Author: Parker
+ * @CreateTime: 2020-09-19 00:08
+ * @Description: 转化对象工具类
+ *
+ * 用于 Wrapper 对象 转化为本地对象，或者本地对象转化为Wrapper对象
+ *
+ */
+@Slf4j
+public final class WrapperUtil {
+
+    /** 私有化构造函数 */
+    private WrapperUtil(){}
+
+    /**
+     * 转化对象
+     * @param from
+     * @param toClass
+     * @param <M>
+     * @return
+     */
+    public static <T,M> M transformInstance(T from, Class<M> toClass){
+        M m = null;
+        try {
+            Object toObj = ReflectUtil.newInstance(toClass);
+            Map<String, Object> stringBeanMap = BeanUtil.beanToMap(from);
+            if(stringBeanMap != null){
+                Object toInstance = BeanUtil.fillBeanWithMapIgnoreCase(stringBeanMap, toObj, true);
+                if(toInstance != null){
+                    m = (M) toInstance;
+                }
+            }
+        }catch (Exception e){
+            log.error(e.getMessage(),e);
+        }
+        return m;
+    }
+
+
+    /**
+     * 转化集合对象
+     * @param froms
+     * @param toClass
+     * @param <M>
+     * @return
+     */
+    public static <T,M> List<M> transformInstance(List<T> froms, Class<M> toClass){
+        List<M> toInstanceList = Lists.newArrayListWithCapacity(froms.size());
+        try {
+            for (Object from : froms) {
+                Object toObj = ReflectUtil.newInstance(toClass);
+                Map<String, Object> stringBeanMap = BeanUtil.beanToMap(from);
+                if(stringBeanMap != null){
+                    Object toInstance = BeanUtil.fillBeanWithMapIgnoreCase(stringBeanMap, toObj, true);
+                    if(toInstance != null){
+                        toInstanceList.add((M) toInstance);
+                    }
+                }
+            }
+
+        }catch (Exception e){
+            log.error(e.getMessage(),e);
+        }
+        return toInstanceList;
+    }
+
+    /**
+     * 克隆并且转化对象
+     * @param from
+     * @param toClass
+     * @param <M>
+     * @return
+     */
+    public static <T,M> M cloneTransformInstance(T from, Class<M> toClass){
+        T fromByClone = ObjectUtil.cloneByStream(from);
+        return transformInstance(fromByClone,toClass);
+    }
+
+
+    /**
+     * 克隆并且转化集合对象
+     * @param froms
+     * @param toClass
+     * @param <M>
+     * @return
+     */
+    public static <T,M> List<M> cloneTransformInstance(List<T> froms, Class<M> toClass){
+        List<T> ts = ObjectUtil.cloneByStream(froms);
+        return transformInstance(ts,toClass);
+    }
+
+}

opsli-base-support/pom.xml

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>opsli-boot-parent</artifactId>
+        <groupId>org.opsliframework.boot</groupId>
+        <version>1.0.0</version>
+    </parent>
+
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>opsli-base-support</artifactId>
+    <version>1.0.0</version>
+    <packaging>pom</packaging>
+
+    <modules>
+        <module>opsli-common</module>
+        <module>opsli-core</module>
+    </modules>
+
+</project>

opsli-core/src/main/java/org/opsli/core/base/service/impl/CrudServiceImpl.java

@@ -1,122 +0,0 @@
-package org.opsli.core.base.service.impl;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.google.common.collect.Lists;
-import lombok.extern.slf4j.Slf4j;
-import org.opsli.core.base.entity.BaseEntity;
-import org.opsli.core.base.service.base.BaseService;
-import org.opsli.core.base.service.interfaces.CrudServiceInterface;
-
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.List;
-
-/**
- * @BelongsProject: opsli-boot
- * @BelongsPackage: org.opsli.common.base.service.impl
- * @Author: Parker
- * @CreateTime: 2020-09-14 17:31
- * @Description: CurdServiceImpl 基类 - 实现类
- *
- * 这里 可能觉得 增改 最次返回的也是实体对象 设计的有问题
- *
- * 其实是为了 热点数据 切面用的 用来 增加或者清理数据
- *
- * 没有 直接用一个save类的原因，可能是觉得 新增和修改分开一些会比较好 防止串了数据
- *
- */
-@Slf4j
-public abstract class CrudServiceImpl<M extends BaseMapper<T>, T extends BaseEntity>
-        extends BaseService<M, T> implements CrudServiceInterface<T> {
-
-    /** entity Class 类 */
-    protected Class<T> entityClazz;
-
-
-    @Override
-    public T get(String id) {
-        return baseMapper.selectById(id);
-    }
-
-    @Override
-    public T get(T entity) {
-        if(entity == null)  return null;
-        return baseMapper.selectById(entity.getId());
-    }
-
-    @Override
-    public List<T> findList(T entity) {
-        //baseMapper.selectList()
-        return null;
-    }
-
-    @Override
-    public T insert(T entity) {
-        if(entity == null) return null;
-        int count = baseMapper.insert(entity);
-        if(count > 0){
-            return entity;
-        }
-        return null;
-    }
-
-    @Override
-    public T update(T entity) {
-        if(entity == null) return null;
-        int count = baseMapper.updateById(entity);
-        if(count > 0){
-            return entity;
-        }
-        return null;
-    }
-
-    @Override
-    public int delete(String id) {
-        return baseMapper.deleteById(id);
-    }
-
-    @Override
-    public int delete(T entity) {
-        if(entity == null) return 0;
-        return baseMapper.deleteById(entity.getId());
-    }
-
-    @Override
-    public int deleteAll(String[] ids) {
-        if(ids == null) return 0;
-        List<String> idList = Arrays.asList(ids);
-        return baseMapper.deleteBatchIds(idList);
-    }
-
-    @Override
-    public int deleteAll(Collection<T> entitys) {
-        if(entitys == null || entitys.isEmpty()) return 0;
-        List<String> idList = Lists.newArrayListWithCapacity(entitys.size());
-        for (T entity : entitys) {
-            idList.add(entity.getId());
-        }
-        return baseMapper.deleteBatchIds(idList);
-    }
-
-    @Override
-    public int deleteByLogic(String id) {
-        return 0;
-    }
-
-    @Override
-    public int deleteByLogic(T entity) {
-        return 0;
-    }
-
-    @Override
-    public int deleteAllByLogic(String[] ids) {
-        return 0;
-    }
-
-    @Override
-    public int deleteAllByLogic(Collection<T> entities) {
-        return 0;
-    }
-
-
-}

opsli-core/src/main/java/org/opsli/core/base/service/interfaces/CrudServiceInterface.java

@@ -1,136 +0,0 @@
-package org.opsli.core.base.service.interfaces;
-
-
-
-import java.util.Collection;
-import java.util.List;
-
-public interface CrudServiceInterface<T> extends BaseServiceInterface<T> {
-
-
-    /**
-     * 获取单条数据
-     *
-     * @param id
-     * @return
-     */
-    T get(String id);
-
-    /**
-     * 获取单条数据
-     *
-     * @param entity
-     * @return
-     */
-    T get(T entity);
-
-
-    /**
-     * 查询数据列表
-     *
-     * @param entity
-     * @return
-     */
-    List<T> findList(T entity);
-
-
-    /**
-     * 插入数据
-     *
-     * @param entity
-     * @return
-     */
-    T insert(T entity);
-
-    /**
-     * 更新数据
-     *
-     * @param entity
-     * @return
-     */
-    T update(T entity);
-
-
-    /**
-     * 删除数据（物理删除，从数据库中彻底删除）
-     *
-     * @param id
-     * @return
-     * @see int delete(T entity)
-     */
-    int delete(String id);
-
-
-    /**
-     * 删除数据（物理删除，从数据库中彻底删除）
-     *
-     * @param entity
-     * @return
-     */
-    int delete(T entity);
-
-
-    /**
-     * 批量物理删除
-     * @param ids
-     * @return
-     */
-    int deleteAll(String[] ids);
-
-    /**
-     * 批量物理删除
-     * @param entitys
-     * @return
-     */
-    int deleteAll(Collection<T> entitys);
-
-
-    /**
-     * 删除数据（逻辑删除，更新del_flag字段为1,在表包含字段del_flag时，可以调用此方法，将数据隐藏）
-     *
-     * @param id
-     * @return
-     * @see int delete(T entity)
-     */
-    int deleteByLogic(String id);
-
-
-    /**
-     * 删除数据（逻辑删除，更新del_flag字段为1,在表包含字段del_flag时，可以调用此方法，将数据隐藏）
-     *
-     * @param entity
-     * @return
-     * @see int delete(T entity)
-     */
-    int deleteByLogic(T entity);
-
-
-    /**
-     * 批量逻辑删除
-     * @param ids
-     * @return
-     */
-    int deleteAllByLogic(String[] ids);
-
-    /**
-     * 批量逻辑删除
-     * @param entitys
-     * @return
-     */
-    int deleteAllByLogic(Collection<T> entitys);
-
-    /**
-     * 查询所有数据列表
-     *
-     * @return
-     * @see List<T> findAllList(T entity)
-     */
-    //Page findPage(Page page, T t);
-
-
-}
-
-
-
-
-

opsli-core/src/main/java/org/opsli/core/conf/SpringWebMvcConfig.java

@@ -1,27 +0,0 @@
-package org.opsli.core.conf;
-
-import org.opsli.common.annotation.ApiRestController;
-import org.opsli.core.prop.ApiPathProperties;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.web.servlet.config.annotation.PathMatchConfigurer;
-import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
-
-import javax.annotation.Resource;
-
-/**
- * 配置统一的后台接口访问路径的前缀
- * @author C西
- */
-@Configuration
-public class SpringWebMvcConfig implements WebMvcConfigurer {
-
-	@Resource
-	private ApiPathProperties apiPathProperties;
-
-	@Override
-	public void configurePathMatch(PathMatchConfigurer configurer) {
-		configurer
-				.addPathPrefix(apiPathProperties.getGlobalPrefix(),c -> c.isAnnotationPresent(ApiRestController.class));
-	}
- 
-}

opsli-modulars/opsli-modulars-test/src/main/java/org/opsli/modulars/test/mapper/TestMapper.java

@@ -9,7 +9,7 @@ import org.opsli.modulars.test.entity.TestEntity;
  * @BelongsPackage: org.opsli.modulars.test.mapper
  * @Author: Parker
  * @CreateTime: 2020-09-17 13:01
- * @Description: TODO
+ * @Description: 测试Mapper
  */
 @Mapper
 public interface TestMapper extends BaseMapper<TestEntity> {

opsli-modulars/opsli-modulars-test/src/main/java/org/opsli/modulars/test/service/ITestService.java

@@ -1,5 +1,6 @@
 package org.opsli.modulars.test.service;
 
+import org.opsli.api.wrapper.test.TestModel;
 import org.opsli.core.base.service.interfaces.CrudServiceInterface;
 import org.opsli.modulars.test.entity.TestEntity;
 
@@ -10,13 +11,13 @@ import org.opsli.modulars.test.entity.TestEntity;
  * @CreateTime: 2020-09-17 13:07
  * @Description: 测试接口
  */
-public interface ITestService extends CrudServiceInterface<TestEntity> {
+public interface ITestService extends CrudServiceInterface<TestModel,TestEntity> {
 
     /**
      * 根据名称 获得对象
-     * @param testEntity
+     * @param model
      * @return
      */
-    TestEntity getByName(TestEntity testEntity);
+    TestModel getByName(TestModel model);
 
 }

opsli-modulars/opsli-modulars-test/src/main/java/org/opsli/modulars/test/service/impl/TestServiceImpl.java

@@ -1,5 +1,6 @@
 package org.opsli.modulars.test.service.impl;
 
+import org.opsli.api.wrapper.test.TestModel;
 import org.opsli.common.annotation.EnableHotData;
 import org.opsli.common.annotation.HotDataDel;
 import org.opsli.common.annotation.HotDataPut;
@@ -25,32 +26,35 @@ import java.util.Collection;
  * 然后对 需要处理数据的 方法重写 并且加上 热数据处理 注解
  * -- @HotDataPut 热数据更新     @HotDataDel 热数据删除
  *
+ *
  */
 @Service
 // 开启热数据标示 不加不生效
 @EnableHotData
-public class TestServiceImpl extends CrudServiceImpl<TestMapper,TestEntity> implements ITestService {
+public class TestServiceImpl extends CrudServiceImpl<TestMapper, TestModel, TestEntity> implements ITestService {
 
     @Autowired(required = false)
     private TestMapper mapper;
 
     @Override
-    public TestEntity getByName(TestEntity testEntity) {
+    public TestModel getByName(TestModel model) {
-        return mapper.getByName(testEntity);
+        TestEntity entity = super.transformM2T(model);
+        return super.transformT2M(
+                mapper.getByName(entity));
     }
 
     // ============== 重写 父类方法 实现热数据操作 ==============
 
     @Override
     @HotDataPut
-    public TestEntity insert(TestEntity entity) {
+    public TestModel insert(TestModel model) {
-        return super.insert(entity);
+        return super.insert(model);
     }
 
     @Override
     @HotDataPut
-    public TestEntity update(TestEntity entity) {
+    public TestModel update(TestModel model) {
-        return super.update(entity);
+        return super.update(model);
     }
 
     @Override
@@ -61,20 +65,8 @@ public class TestServiceImpl extends CrudServiceImpl<TestMapper,TestEntity> impl
 
     @Override
     @HotDataDel
-    public int delete(TestEntity entity) {
+    public int delete(TestModel model) {
-        return super.delete(entity);
+        return super.delete(model);
-    }
-
-    @Override
-    @HotDataDel
-    public int deleteByLogic(String id) {
-        return super.deleteByLogic(id);
-    }
-
-    @Override
-    @HotDataDel
-    public int deleteByLogic(TestEntity entity) {
-        return super.deleteByLogic(entity);
     }
 
     @Override
@@ -85,21 +77,10 @@ public class TestServiceImpl extends CrudServiceImpl<TestMapper,TestEntity> impl
 
     @Override
     @HotDataDel
-    public int deleteAll(Collection<TestEntity> entitys) {
+    public int deleteAll(Collection<TestModel> models) {
-        return super.deleteAll(entitys);
+        return super.deleteAll(models);
-    }
-
-    @Override
-    @HotDataDel
-    public int deleteAllByLogic(String[] ids) {
-        return super.deleteAllByLogic(ids);
     }
 
-    @Override
-    @HotDataDel
-    public int deleteAllByLogic(Collection<TestEntity> entities) {
-        return super.deleteAllByLogic(entities);
-    }
 }
 
 

opsli-modulars/opsli-modulars-test/src/main/java/org/opsli/modulars/test/web/TestRestRestController.java

@@ -1,9 +1,12 @@
 package org.opsli.modulars.test.web;
 
 import cn.hutool.core.thread.ThreadUtil;
+import io.swagger.annotations.ApiOperation;
 import org.apache.commons.lang3.StringUtils;
+import org.opsli.api.base.result.ResultVo;
+import org.opsli.api.wrapper.test.TestModel;
+import org.opsli.api.web.test.ITestApi;
 import org.opsli.common.annotation.ApiRestController;
-import org.opsli.common.api.ResultVo;
 import org.opsli.core.base.concroller.BaseRestController;
 import org.opsli.core.cache.pushsub.enums.CacheType;
 import org.opsli.core.cache.pushsub.msgs.DictMsgFactory;
@@ -16,7 +19,6 @@ import org.opsli.plugins.redis.RedisPlugin;
 import org.opsli.plugins.redis.lock.RedisLock;
 import org.opsli.plugins.redis.pushsub.entity.BaseSubMessage;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -32,7 +34,8 @@ import java.util.concurrent.TimeUnit;
  * @Description: 测试类
  */
 @ApiRestController("/test")
-public class TestRestRestController extends BaseRestController<TestEntity, ITestService> {
+public class TestRestRestController extends BaseRestController<TestModel, TestEntity, ITestService>
+        implements ITestApi {
 
 
     private Random random = new Random();
@@ -46,8 +49,8 @@ public class TestRestRestController extends BaseRestController<TestEntity, ITest
     @Autowired
     private RedisLockPlugins redisLockPlugins;
 
-
+    @ApiOperation(value = "发送邮件", notes = "发送邮件")
-    @GetMapping("/sendMail")
+    @Override
     public ResultVo sendMail(){
         MailModel mailModel = new MailModel();
         mailModel.setTo("meet.carina@foxmail.com");
@@ -62,7 +65,8 @@ public class TestRestRestController extends BaseRestController<TestEntity, ITest
      * 发送 Redis 订阅消息
      * @return
      */
-    @GetMapping("/sendMsg")
+    @ApiOperation(value = "发送 Redis 订阅消息", notes = "发送 Redis 订阅消息")
+    @Override
     public ResultVo sendMsg(){
 
         BaseSubMessage msg = DictMsgFactory.createMsg("test", "aaa", 123213, CacheType.UPDATE);
@@ -76,10 +80,11 @@ public class TestRestRestController extends BaseRestController<TestEntity, ITest
 
 
     /**
-     * 发送 Redis 订阅消息
+     * 发送 Redis 测试
      * @return
      */
-    @GetMapping("/redisTest")
+    @ApiOperation(value = "发送 Redis 测试", notes = "发送 Redis 测试")
+    @Override
     public ResultVo redisTest(){
         boolean ret = redisPlugin.put("opsli:test", "12315");
         if(ret){
@@ -96,7 +101,8 @@ public class TestRestRestController extends BaseRestController<TestEntity, ITest
      * 发送 Redis 分布式锁
      * @return
      */
-    @GetMapping("/testLock")
+    @ApiOperation(value = "发起 Redis 分布式锁", notes = "发起 Redis 分布式锁")
+    @Override
     public ResultVo testLock(){
 
         // 锁凭证 redisLock 贯穿全程
@@ -126,52 +132,47 @@ public class TestRestRestController extends BaseRestController<TestEntity, ITest
      * 新增数据
      * @return
      */
-    @GetMapping("/insert")
+    @ApiOperation(value = "新增数据", notes = "新增数据")
-    public ResultVo insert(TestEntity entity){
+    @Override
-
+    public ResultVo insert(TestModel model){
+        // 转化对象 处理 ApiModel 与 本地对象
 
-        entity.setId(null);
+        model.setName("测试名称"+random.nextInt());
-        entity.setName("测试名称"+random.nextInt());
+        model.setRemark("测试备注"+random.nextInt());
-        entity.setRemark("测试备注"+random.nextInt());
-
-        TestEntity saveObj = IService.insert(entity);
-        if(saveObj == null){
-            ResultVo success = ResultVo.error("新增对象失败！");
-            success.put("object",entity);
-            return success;
-        }
 
-        ResultVo success = ResultVo.success("新增对象成功！");
+        // 调用新增方法
-        success.put("object",saveObj);
+        TestModel insert = IService.insert(model);
 
-        return success;
+        ResultVo resultVo = new ResultVo();
+        resultVo.setMsg("新增成功");
+        resultVo.put("data",insert);
+        return resultVo;
     }
 
     /**
      * 修改数据
      * @return
      */
-    @GetMapping("/update")
+    @ApiOperation(value = "修改数据", notes = "修改数据")
-    public ResultVo update(TestEntity entity){
+    @Override
+    public ResultVo update(TestModel model){
+        // 转化对象 处理 ApiModel 与 本地对象
 
-        if(StringUtils.isEmpty(entity.getId())){
+        if(StringUtils.isEmpty(model.getId())){
-            entity.setId(String.valueOf(random.nextLong()));
+            model.setId(String.valueOf(random.nextLong()));
         }
 
-        entity.setName("修改名称"+random.nextInt());
+        model.setName("修改名称"+random.nextInt());
-        entity.setRemark("修改备注"+random.nextInt());
+        model.setRemark("修改备注"+random.nextInt());
 
-        TestEntity saveObj = IService.update(entity);
+        // 不需要做 锁状态处理，需要判断是否成功 能往下走的只能是成功
-        if(saveObj == null){
+        TestModel update = IService.update(model);
-            ResultVo success = ResultVo.error("修改对象失败！");
-            success.put("object",entity);
-            return success;
-        }
 
-        ResultVo success = ResultVo.success("修改对象成功！");
-        success.put("object",saveObj);
 
-        return success;
+        ResultVo resultVo = new ResultVo();
+        resultVo.setMsg("修改成功");
+        resultVo.put("data",update);
+        return resultVo;
     }
 
 
@@ -179,13 +180,13 @@ public class TestRestRestController extends BaseRestController<TestEntity, ITest
      * 查看对象
      * @return
      */
-    @GetMapping("/get")
+    @ApiOperation(value = "查看对象", notes = "查看对象")
-    public ResultVo get(TestEntity entity){
+    @Override
-        ResultVo success = ResultVo.success("操作成功！");
+    public ResultVo get(TestModel model){
-        TestEntity byName = IService.getByName(entity);
+        // 转化对象 处理 ApiModel 与 本地对象
-        success.put("object",entity);
+        ResultVo resultVo = new ResultVo();
-        success.put("byName",byName);
+        resultVo.put("data",model);
-        return success;
+        return resultVo;
     }
 
 
@@ -193,7 +194,8 @@ public class TestRestRestController extends BaseRestController<TestEntity, ITest
      * 删除对象
      * @return
      */
-    @GetMapping("/del")
+    @ApiOperation(value = "删除对象", notes = "删除对象")
+    @Override
     public ResultVo del(String id){
 
         TestEntity testEntity1 = new TestEntity();
@@ -202,9 +204,36 @@ public class TestRestRestController extends BaseRestController<TestEntity, ITest
         List<TestEntity> idList = new ArrayList<>();
         idList.add(testEntity1);
 
+
+        //count = IService.delete(id);
+
+        //count = IService.delete(testEntity1);
+
+        //count = IService.deleteAll(idList);
+
+
+        IService.deleteAll(ids);
+
+        ResultVo resultVo = new ResultVo();
+        resultVo.put("data",id);
+        resultVo.setMsg("删除对象成功");
+        return resultVo;
+    }
+
+
+    /**
+     * 删除对象
+     * @return
+     */
+    @ApiOperation(value = "删除全部对象", notes = "删除全部对象")
+    @Override
+    public ResultVo delAll(){
+
+        //IService.
+
         int count = 0;
 
-        count = IService.delete(id);
+        //count = IService.delete(id);
 
         //count = IService.delete(testEntity1);
 
@@ -213,18 +242,12 @@ public class TestRestRestController extends BaseRestController<TestEntity, ITest
         //count = IService.deleteAll(idList);
 
 
-        if(count == 0){
-            ResultVo success = ResultVo.error("删除对象失败！");
-            success.put("object",id);
-            return success;
-        }
 
-        ResultVo success = ResultVo.success("删除对象成功！");
-        success.put("object",id);
 
-        return success;
+        ResultVo resultVo = new ResultVo();
+        resultVo.setMsg("删除对象成功");
+        return resultVo;
     }
 
 
-
 }

opsli-modulars/pom.xml

@@ -40,13 +40,6 @@
         <!-- 插件版本 ${plugins.version} -->
         <!-- 模块版本 ${modulars.version}-->
 
-        <!-- 引入公共模块 -->
-        <dependency>
-            <groupId>org.opsliframework.boot</groupId>
-            <artifactId>opsli-common</artifactId>
-            <version>${project.parent.version}</version>
-        </dependency>
-
         <!-- 引入核心模块 -->
         <dependency>
             <groupId>org.opsliframework.boot</groupId>

opsli-starter/pom.xml

@@ -10,7 +10,7 @@
 
 
     <modelVersion>4.0.0</modelVersion>
-    <artifactId>opsli-web</artifactId>
+    <artifactId>opsli-starter</artifactId>
     <version>${project.parent.version}</version>
 
 

opsli-starter/src/main/java/org/opsli/OpsliApplication.java

@@ -7,7 +7,6 @@ import org.springframework.context.ConfigurableApplicationContext;
 import springfox.documentation.swagger2.annotations.EnableSwagger2;
 
 
-@EnableSwagger2
 @SpringBootApplication()
 public class OpsliApplication {
 

pom.xml

@@ -47,11 +47,13 @@
 
     <!-- 引入 modules -->
     <modules>
-        <module>opsli-web</module>
+        <module>opsli-api</module>
-        <module>opsli-core</module>
+        <module>opsli-base-support</module>
-        <module>opsli-common</module>
+<!--        <module>opsli-common</module>-->
+<!--        <module>opsli-core</module>-->
         <module>opsli-plugins</module>
         <module>opsli-modulars</module>
+        <module>opsli-starter</module>
     </modules>
 
     <!-- 全局版本 -->
@@ -188,41 +190,6 @@
         </dependency>
         <!-- ———————————————————— 集成数据库相关配置 - 结束 ———————————————————— -->
 
-        <!-- ———————————————————— 集成SwaggerApi - 开始 ———————————————————— -->
-        <!-- Swagger API文档 -->
-        <dependency>
-            <groupId>io.springfox</groupId>
-            <artifactId>springfox-swagger2</artifactId>
-            <version>2.9.2</version>
-        </dependency>
-        <dependency>
-            <groupId>io.springfox</groupId>
-            <artifactId>springfox-swagger-ui</artifactId>
-            <version>2.9.2</version>
-        </dependency>
-        <dependency>
-            <groupId>com.github.xiaoymin</groupId>
-            <artifactId>swagger-bootstrap-ui</artifactId>
-            <version>1.9.3</version>
-        </dependency>
-        <dependency>
-            <groupId>io.springfox</groupId>
-            <artifactId>springfox-bean-validators</artifactId>
-            <version>2.9.2</version>
-        </dependency>
-        <!-- # 增加两个配置解决 NumberFormatException -->
-        <dependency>
-            <groupId>io.swagger</groupId>
-            <artifactId>swagger-annotations</artifactId>
-            <version>1.5.22</version>
-        </dependency>
-        <dependency>
-            <groupId>io.swagger</groupId>
-            <artifactId>swagger-models</artifactId>
-            <version>1.5.22</version>
-        </dependency>
-        <!-- ———————————————————— 集成SwaggerApi - 结束 ———————————————————— -->
-
         <!-- ———————————————————— 集成工具 - 开始 ———————————————————— -->
         <!-- commons -->
         <dependency>
@@ -248,6 +215,9 @@
             <version>${guava.version}</version>
         </dependency>
 
+
+
+
         <!-- Lombok -->
         <dependency>
             <groupId>org.projectlombok</groupId>