租户管理-租户单位配置-列表查询

fiveep-controller/src/main/java/com/bizmatics/controller/web/SysTenantController.java

@@ -2,13 +2,14 @@ package com.bizmatics.controller.web;
 
 
 import com.bizmatics.common.core.bean.ApiResult;
+import com.bizmatics.common.core.bean.CommonPage;
+import com.bizmatics.model.SysTenant;
+import com.bizmatics.model.vo.SysTenantOneVo;
 import com.bizmatics.model.vo.SysTenantVo;
 import com.bizmatics.service.SysTenantService;
 import com.bizmatics.service.system.ISysUserService;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
 
@@ -39,6 +40,11 @@ public class SysTenantController {
         return ApiResult.success(sysTenantService.getUserData());
     }
 
+    @PostMapping("getTenantData")
+    public ApiResult<CommonPage<SysTenant>> getTenantData(@RequestBody SysTenantOneVo sysTenantOneVo) {
+        return ApiResult.success(sysTenantService.getTenantData(sysTenantOneVo));
+    }
+
 
 }
 

fiveep-controller/src/main/java/com/bizmatics/controller/web/TenantConfigController.java

@@ -0,0 +1,36 @@
+package com.bizmatics.controller.web;
+
+
+import com.bizmatics.common.core.bean.ApiResult;
+import com.bizmatics.model.vo.SysTenantVo;
+import com.bizmatics.service.SysTenantService;
+import com.bizmatics.service.system.ISysUserService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ * 个人中心
+ *
+ * @author ya
+ * @since 2022-05-05
+ */
+@RestController
+@RequestMapping("/sysTenant")
+public class TenantConfigController {
+
+    @Autowired
+    private SysTenantService sysTenantService;
+
+    @Autowired
+    private ISysUserService userService;
+
+
+
+
+
+}
+

fiveep-model/src/main/java/com/bizmatics/model/SysTenant.java

@@ -69,6 +69,11 @@ public class SysTenant implements Serializable {
      */
     private String address;
 
+    /**
+     * 地理位置
+     */
+    private String geoPosition;
+
     /**
      * 有效期限
      */

fiveep-model/src/main/java/com/bizmatics/model/vo/SysTenantOneVo.java

@@ -0,0 +1,63 @@
+package com.bizmatics.model.vo;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 租户信息表
+ * </p>
+ *
+ * @author ya
+ * @since 2022-05-05
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class SysTenantOneVo implements Serializable {
+    /**
+     * 租户名称
+     */
+    private String tenantName;
+
+    /**
+     * 租户负责人
+     */
+    private String tenantManager;
+
+    /**
+     * 租户类型（0 试用租户  1 正式租户）
+     */
+    private String tenantType;
+
+    /**
+     * 开始时间
+     */
+    private String startTime;
+
+    /**
+     * 结束时间
+     */
+    private String endTime;
+
+    /**
+     * 租户状态（0正常 1停用）
+     */
+    private String status;
+
+    /**
+     * 当前页
+     */
+    private Integer page;
+
+    /**
+     * 总条数
+     */
+    private Integer size;
+}

fiveep-persistence/src/main/java/com/bizmatics/persistence/mapper/SysTenantMapper.java

@@ -20,4 +20,13 @@ public interface SysTenantMapper extends CrudMapper<SysTenant> {
 
     List<SysTenantVo> getUserData(@Param("userId") int userId);
 
+    List<SysTenant> getTenantData(@Param("tenantName") String tenantName,
+                                  @Param("tenantManager") String tenantManager,
+                                  @Param("tenantType") String tenantType,
+                                  @Param("status") String status,
+                                  @Param("startTime") String startTime,
+                                  @Param("endTime") String endTime,
+                                  @Param("current") Integer current,
+                                  @Param("size") Integer size);
+
 }

fiveep-persistence/src/main/resources/mapper/mysql/SysTenantMapper.xml

@@ -13,6 +13,7 @@
         <result column="email" property="email" />
         <result column="phone_number" property="phoneNumber" />
         <result column="address" property="address" />
+        <result column="geo_position" property="geoPosition" />
         <result column="tenant_term" property="tenantTerm" />
         <result column="remark" property="remark" />
         <result column="status" property="status" />
@@ -34,4 +35,31 @@
         </where>
     </select>
 
+    <select id="getTenantData" resultType="com.bizmatics.model.SysTenant">
+        SELECT
+        *
+        FROM
+        sys_tenant
+        <where>
+            <if test="tenantName != null and tenantName != ''">
+                and tenant_name LIKE CONCAT(CONCAT('%', #{tenantName}), '%')
+            </if>
+            <if test="tenantManager != null and tenantManager != ''">
+                and tenant_manager LIKE CONCAT(CONCAT('%', #{tenantManager}), '%')
+            </if>
+            <if test="tenantType != null and tenantType != ''">
+                and tenant_type = #{tenantType}
+            </if>
+            <if test="status != null and status != ''">
+                and status = #{status}
+            </if>
+            <if test="endTime != null and startTime != null and endTime != '' and startTime != ''">
+                and tenant_term BETWEEN #{startTime} and #{endTime}
+            </if>
+        </where>
+        <if test="current != null and size != null and size != 0">
+            limit #{current},#{size}
+        </if>
+    </select>
+
 </mapper>

fiveep-service/src/main/java/com/bizmatics/service/SysTenantService.java

@@ -1,8 +1,10 @@
 package com.bizmatics.service;
 
+import com.bizmatics.common.core.bean.CommonPage;
 import com.bizmatics.model.SysTenant;
 import com.bizmatics.common.mvc.base.CrudService;
 import com.bizmatics.model.system.SysUser;
+import com.bizmatics.model.vo.SysTenantOneVo;
 import com.bizmatics.model.vo.SysTenantVo;
 
 import java.util.List;
@@ -18,4 +20,6 @@ import java.util.List;
 public interface SysTenantService extends CrudService<SysTenant> {
     List<SysTenantVo> getUserData();
 
+    CommonPage<SysTenant> getTenantData(SysTenantOneVo sysTenantOneVo);
+
 }

fiveep-service/src/main/java/com/bizmatics/service/impl/SysTenantServiceImpl.java

@@ -1,9 +1,11 @@
 package com.bizmatics.service.impl;
 
+import com.bizmatics.common.core.bean.CommonPage;
 import com.bizmatics.model.Device;
 import com.bizmatics.model.SysTenant;
 import com.bizmatics.model.system.SysUser;
 import com.bizmatics.model.vo.SiteDeviceCountVo;
+import com.bizmatics.model.vo.SysTenantOneVo;
 import com.bizmatics.model.vo.SysTenantVo;
 import com.bizmatics.persistence.mapper.SysTenantMapper;
 import com.bizmatics.persistence.mapper.system.SysUserMapper;
@@ -36,4 +38,36 @@ public class SysTenantServiceImpl extends AbstractCrudService<SysTenantMapper, S
         List<SysTenantVo> list = baseMapper.getUserData(userId);
         return list;
     }
+
+    /**
+     * 租户管理-租户列表查询
+     * @param sysTenantOneVo
+     * @return
+     */
+    @Override
+    public CommonPage<SysTenant> getTenantData(SysTenantOneVo sysTenantOneVo){
+        List<SysTenant> list1 = baseMapper.getTenantData(sysTenantOneVo.getTenantName() ,
+                                                         sysTenantOneVo.getTenantManager() ,
+                                                         sysTenantOneVo.getTenantType() ,
+                                                         sysTenantOneVo.getStatus() ,
+                                                         sysTenantOneVo.getStartTime() ,
+                                                         sysTenantOneVo.getEndTime() ,null ,null);
+        int total = 0;
+        if (list1.size() > 0) {
+            total = list1.size();
+        }
+        Integer current = null;
+        if (sysTenantOneVo.getPage()!=null&&sysTenantOneVo.getSize()>0){
+            current = (sysTenantOneVo.getPage() - 1) * sysTenantOneVo.getSize();
+        }
+        List<SysTenant> list = baseMapper.getTenantData(sysTenantOneVo.getTenantName() ,
+                                                        sysTenantOneVo.getTenantManager() ,
+                                                        sysTenantOneVo.getTenantType() ,
+                                                        sysTenantOneVo.getStatus() ,
+                                                        sysTenantOneVo.getStartTime() ,
+                                                        sysTenantOneVo.getEndTime() ,
+                                                        current ,
+                                                        sysTenantOneVo.getSize());
+        return new CommonPage<>(list, total, sysTenantOneVo.getSize(), sysTenantOneVo.getPage());
+    }
 }