配置切换到开发环境,代码生成器添加分页非空,实体公共类添加分页参数

soc-auth/src/main/resources/bootstrap.yml

@@ -14,15 +14,16 @@ spring:
     nacos:
       discovery:
         # 服务注册地址
-        server-addr: 10.87.10.227:8848
+        server-addr: 10.87.10.54:8848
       config:
         # 配置中心地址
-        server-addr: 10.87.10.227:8848
+        server-addr: 10.87.10.54:8848
         # 配置文件格式
         file-extension: yml
         # 共享配置
         shared-configs:
           - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
+#        group: luojun
 logging:
   file:
     name: logs/${spring.application.name}/info.log

soc-common/soc-common-core/src/main/java/com/xunmei/common/core/web/domain/BaseEntity.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonInclude;
+import io.swagger.annotations.ApiModelProperty;
 
 import java.io.Serializable;
 import java.util.Date;
@@ -12,99 +13,121 @@ import java.util.Map;
 
 /**
  * Entity基类
- * 
+ *
  * @author xunmei
  */
-public class BaseEntity implements Serializable
-{
+public class BaseEntity implements Serializable {
     private static final long serialVersionUID = 1L;
 
-    /** 搜索值 */
+    /**
+     * 搜索值
+     */
     @JsonIgnore
     @TableField(exist = false)
     private String searchValue;
 
-    /** 创建者 */
+    @TableField(exist = false)
+    @ApiModelProperty(value = "页数")
+    private Long pageNum;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "每页大小")
+    private Long pageSize;
+
+    /**
+     * 创建者
+     */
     private String createBy;
 
-    /** 创建时间 */
+    /**
+     * 创建时间
+     */
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date createTime;
 
-    /** 更新者 */
+    /**
+     * 更新者
+     */
     private String updateBy;
 
-    /** 更新时间 */
+    /**
+     * 更新时间
+     */
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date updateTime;
 
 
-    /** 请求参数 */
+    /**
+     * 请求参数
+     */
     @JsonInclude(JsonInclude.Include.NON_EMPTY)
     @TableField(exist = false)
     private Map<String, Object> params;
 
-    public String getSearchValue()
-    {
+    public Long getPageNum() {
+        return pageNum;
+    }
+
+    public void setPageNum(Long pageNum) {
+        this.pageNum = pageNum;
+    }
+
+    public Long getPageSize() {
+        return pageSize;
+    }
+
+    public void setPageSize(Long pageSize) {
+        this.pageSize = pageSize;
+    }
+
+    public String getSearchValue() {
         return searchValue;
     }
 
-    public void setSearchValue(String searchValue)
-    {
+    public void setSearchValue(String searchValue) {
         this.searchValue = searchValue;
     }
 
-    public String getCreateBy()
-    {
+    public String getCreateBy() {
         return createBy;
     }
 
-    public void setCreateBy(String createBy)
-    {
+    public void setCreateBy(String createBy) {
         this.createBy = createBy;
     }
 
-    public Date getCreateTime()
-    {
+    public Date getCreateTime() {
         return createTime;
     }
 
-    public void setCreateTime(Date createTime)
-    {
+    public void setCreateTime(Date createTime) {
         this.createTime = createTime;
     }
 
-    public String getUpdateBy()
-    {
+    public String getUpdateBy() {
         return updateBy;
     }
 
-    public void setUpdateBy(String updateBy)
-    {
+    public void setUpdateBy(String updateBy) {
         this.updateBy = updateBy;
     }
 
-    public Date getUpdateTime()
-    {
+    public Date getUpdateTime() {
         return updateTime;
     }
 
-    public void setUpdateTime(Date updateTime)
-    {
+    public void setUpdateTime(Date updateTime) {
         this.updateTime = updateTime;
     }
 
-    public Map<String, Object> getParams()
-    {
-        if (params == null)
-        {
+    public Map<String, Object> getParams() {
+        if (params == null) {
             params = new HashMap<>();
         }
         return params;
     }
 
-    public void setParams(Map<String, Object> params)
-    {
+    public void setParams(Map<String, Object> params) {
         this.params = params;
     }
 }

soc-gateway/src/main/resources/bootstrap.yml

@@ -14,24 +14,25 @@ spring:
     nacos:
       discovery:
         # 服务注册地址
-        server-addr: 10.87.10.227:8848
+        server-addr: 10.87.10.54:8848
       config:
         # 配置中心地址
-        server-addr: 10.87.10.227:8848
+        server-addr: 10.87.10.54:8848
         # 配置文件格式
         file-extension: yml
         # 共享配置
         shared-configs:
           - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
+#        group: luojun
     sentinel:
       #取消控制台懒加载
       eager: true
       transport:
-        dashboard: 10.87.10.227:8088
+        dashboard: 10.87.10.54:8088
       datasource:
         ds1:
           nacos:
-            server-addr: 10.87.10.227:8848
+            server-addr: 10.87.10.54:8848
             dataId: sentinel-soc-gateway
             groupId: DEFAULT_GROUP
             data-type: json

soc-modules/soc-modules-api/src/main/resources/bootstrap.yml

@@ -14,10 +14,10 @@ spring:
     nacos:
       discovery:
         # 服务注册地址
-        server-addr: 10.87.10.227:8846
+        server-addr: 10.87.10.54:8846
       config:
         # 配置中心地址
-        server-addr: 10.87.10.227:8846
+        server-addr: 10.87.10.54:8846
         # 配置文件格式
         file-extension: yml
         # 共享配置

soc-modules/soc-modules-core/src/main/resources/bootstrap.yml

@@ -14,10 +14,10 @@ spring:
     nacos:
       discovery:
         # 服务注册地址
-        server-addr: 10.87.10.227:8846
+        server-addr: 10.87.10.54:8846
       config:
         # 配置中心地址
-        server-addr: 10.87.10.227:8846
+        server-addr: 10.87.10.54:8846
         # 配置文件格式
         file-extension: yml
         # 共享配置

soc-modules/soc-modules-file/src/main/resources/bootstrap.yml

@@ -14,10 +14,10 @@ spring:
     nacos:
       discovery:
         # 服务注册地址
-        server-addr: 10.87.10.227:8848
+        server-addr: 10.87.10.54:8848
       config:
         # 配置中心地址
-        server-addr: 10.87.10.227:8848
+        server-addr: 10.87.10.54:8848
         # 配置文件格式
         file-extension: yml
         # 共享配置

soc-modules/soc-modules-gen/src/main/resources/bootstrap.yml

@@ -14,10 +14,10 @@ spring:
     nacos:
       discovery:
         # 服务注册地址
-        server-addr: 10.87.10.227:8848
+        server-addr: 10.87.10.54:8848
       config:
         # 配置中心地址
-        server-addr: 10.87.10.227:8848
+        server-addr: 10.87.10.54:8848
         # 配置文件格式
         file-extension: yml
         # 共享配置

soc-modules/soc-modules-gen/src/main/resources/vm/java/controller.java.vm

@@ -49,9 +49,9 @@ public class ${ClassName}Controller extends BaseController {
 @RequiresPermissions("${permissionPrefix}:list")
 @GetMapping("/list")
     #if($table.crud || $table.sub)
-    public TableDataInfo list(${ClassName} ${className}, Long pageNum, Long pageSize) {
+    public TableDataInfo list(${ClassName} ${className}) {
 
-        return ${className}Service.findListByPage( ${className}, pageNum, pageSize);
+        return ${className}Service.selectPage( ${className});
     }
     #elseif($table.tree)
         public AjaxResult list(${ClassName} ${className}) {

soc-modules/soc-modules-gen/src/main/resources/vm/java/service.java.vm

@@ -65,10 +65,8 @@ public interface I${ClassName}Service extends IService<${ClassName}> {
     /**
      * 查询${functionName}分页数据
      *
-     * @param pageNum      页数
-     * @param pageSize      每页大小
      * @param ${className} 查询条件对象
      * @return Page
      */
-    public TableDataInfo findListByPage(${ClassName} ${className}, Long pageNum, Long pageSize);
+    public TableDataInfo selectPage(${ClassName} ${className});
 }

soc-modules/soc-modules-gen/src/main/resources/vm/java/serviceImpl.java.vm

@@ -36,8 +36,13 @@ public class ${ClassName}ServiceImpl extends ServiceImpl<${ClassName}Mapper, ${C
     private ${ClassName}Mapper ${className}Mapper;
 
     @Override
-    public TableDataInfo findListByPage(${ClassName} ${className}, Long pageNum, Long pageSize) {
-        Page<${ClassName}> page = new Page<>(pageNum, pageSize);
+    public TableDataInfo selectPage(${ClassName} ${className}) {
+        Page<${ClassName}> page;
+        if (${className}.getPageNum() != null &&${className}.getPageSize() != null){
+            page = new Page<>(${className}.getPageNum(), ${className}.getPageSize());
+        }else{
+            page = new Page<>();
+        }
         QueryWrapper<${ClassName}> where = new QueryWrapper<>(${className});
         Page<${ClassName}> list = baseMapper.selectPage(page, where);
         TableDataInfo rspData = new TableDataInfo();

soc-modules/soc-modules-job/src/main/resources/bootstrap.yml

@@ -14,10 +14,10 @@ spring:
     nacos:
       discovery:
         # 服务注册地址
-        server-addr: 10.87.10.227:8848
+        server-addr: 10.87.10.54:8848
       config:
         # 配置中心地址
-        server-addr: 10.87.10.227:8848
+        server-addr: 10.87.10.54:8848
         # 配置文件格式
         file-extension: yml
         # 共享配置

soc-modules/soc-modules-sync/src/main/resources/bootstrap.yml

@@ -14,10 +14,10 @@ spring:
     nacos:
       discovery:
         # 服务注册地址
-        server-addr: 10.87.10.227:8846
+        server-addr: 10.87.10.54:8846
       config:
         # 配置中心地址
-        server-addr: 10.87.10.227:8846
+        server-addr: 10.87.10.54:8846
         # 配置文件格式
         file-extension: yml
         # 共享配置

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/controller/SysOrgController.java

@@ -38,18 +38,18 @@ public class SysOrgController extends BaseController {
     @Autowired
     private ISysOrgService sysOrgService;
 
-    /**
-     * 查询【请填写功能名称】列表
-     */
-    @ApiOperation(value = "查询SysOrg列表")
-    @RequiresPermissions("system:org:list")
-    @GetMapping("/list")
-    public TableDataInfo list(SysOrg sysOrg, Long pageNum, Long pageSize) {
+/**
+ * 查询【请填写功能名称】列表
+ */
+@ApiOperation(value = "查询SysOrg列表")
+@RequiresPermissions("system:org:list")
+@GetMapping("/list")
+    public TableDataInfo list(SysOrg sysOrg) {
 
-        return sysOrgService.findListByPage(sysOrg, pageNum, pageSize);
+        return sysOrgService.selectPage( sysOrg);
     }
 
-
+                                                
     /**
      * 获取【请填写功能名称】详细信息
      */

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/service/ISysOrgService.java

@@ -70,5 +70,5 @@ public interface ISysOrgService extends IService<SysOrg> {
      * @param sysOrg 查询条件对象
      * @return Page
      */
-    public TableDataInfo findListByPage(SysOrg sysOrg, Long pageNum, Long pageSize);
+    public TableDataInfo selectPage(SysOrg sysOrg);
 }

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/service/impl/SysOrgServiceImpl.java

@@ -1,7 +1,8 @@
 package com.xunmei.system.service.impl;
 
 import java.util.List;
-        import com.xunmei.common.core.utils.DateUtils;
+
+import com.xunmei.common.core.utils.DateUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -24,8 +25,13 @@ public class SysOrgServiceImpl extends ServiceImpl<SysOrgMapper, SysOrg> impleme
     private SysOrgMapper sysOrgMapper;
 
     @Override
-    public TableDataInfo findListByPage(SysOrg sysOrg, Long pageNum, Long pageSize) {
-        Page<SysOrg> page = new Page<>(pageNum, pageSize);
+    public TableDataInfo selectPage(SysOrg sysOrg) {
+        Page<SysOrg> page;
+        if (sysOrg.getPageNum() != null && sysOrg.getPageSize() != null) {
+            page = new Page<>(sysOrg.getPageNum(), sysOrg.getPageSize());
+        } else {
+            page = new Page<>();
+        }
         QueryWrapper<SysOrg> where = new QueryWrapper<>(sysOrg);
         Page<SysOrg> list = baseMapper.selectPage(page, where);
         TableDataInfo rspData = new TableDataInfo();
@@ -66,8 +72,8 @@ public class SysOrgServiceImpl extends ServiceImpl<SysOrgMapper, SysOrg> impleme
      */
     @Override
     public int insertSysOrg(SysOrg sysOrg) {
-                sysOrg.setCreateTime(DateUtils.getNowDate());
-            return sysOrgMapper.insertSysOrg(sysOrg);
+        sysOrg.setCreateTime(DateUtils.getNowDate());
+        return sysOrgMapper.insertSysOrg(sysOrg);
     }
 
     /**
@@ -78,7 +84,7 @@ public class SysOrgServiceImpl extends ServiceImpl<SysOrgMapper, SysOrg> impleme
      */
     @Override
     public int updateSysOrg(SysOrg sysOrg) {
-                sysOrg.setUpdateTime(DateUtils.getNowDate());
+        sysOrg.setUpdateTime(DateUtils.getNowDate());
         return sysOrgMapper.updateSysOrg(sysOrg);
     }
 

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/util/Generator.java

@@ -63,7 +63,7 @@ public class Generator {
 
         // 数据源配置
         DataSourceConfig dsc = new DataSourceConfig();
-//        dsc.setUrl("jdbc:mysql://10.87.10.227:3306/soc");
+//        dsc.setUrl("jdbc:mysql://10.87.10.54:3306/soc");
 //        dsc.setDriverName("com.mysql.cj.jdbc.Driver");
 //        dsc.setUsername("root");
 //        dsc.setPassword("XM_zm2019");

soc-modules/soc-modules-system/src/main/resources/bootstrap.yml

@@ -14,10 +14,10 @@ spring:
     nacos:
       discovery:
         # 服务注册地址
-        server-addr: 10.87.10.227:8846
+        server-addr: 10.87.10.54:8848
       config:
         # 配置中心地址
-        server-addr: 10.87.10.227:8846
+        server-addr: 10.87.10.54:8848
         # 配置文件格式
         file-extension: yml
         # 共享配置

soc-visual/soc-monitor/src/main/resources/bootstrap.yml

@@ -14,10 +14,10 @@ spring:
     nacos:
       discovery:
         # 服务注册地址
-        server-addr: 10.87.10.227:8848
+        server-addr: 10.87.10.54:8848
       config:
         # 配置中心地址
-        server-addr: 10.87.10.227:8848
+        server-addr: 10.87.10.54:8848
         # 配置文件格式
         file-extension: yml
         # 共享配置