租户管理-平台下拉框接口添加1

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

@@ -18,7 +18,7 @@ import java.util.List;
 public class MybatisGeneratorUtils {
     public static void main(String[] args) {
         //修改成自己的模块名称
-        String[] models = {"usky-power-controller", "usky-power-service", "usky-power-model", "usky-power-persistence"};
+        String[] models = {"fiveep-controller", "fiveep-service", "fiveep-model", "fiveep-persistence"};
         for (String model : models) {
             shell(model);
         }
@@ -70,13 +70,13 @@ public class MybatisGeneratorUtils {
         // strategy.setTablePrefix("t_"); // 表名前缀
         strategy.setEntityLombokModel(true); //使用lombok
         //修改自己想要生成的表
-        strategy.setInclude(new String[]{"sys_tenant_config"});  // 逆向工程使用的表   如果要生成多个,这里可以传入String[]
+        strategy.setInclude(new String[]{"sys_platform"});  // 逆向工程使用的表   如果要生成多个,这里可以传入String[]
         mpg.setStrategy(strategy);
 
         // 关闭默认 xml 生成，调整生成 至 根目录
         //修改对应的模块名称
         TemplateConfig tc = new TemplateConfig();
-        if ("usky-power-persistence".equals(model)) {
+        if ("fiveep-persistence".equals(model)) {
             tc.setController(null);
             tc.setEntity(null);
             tc.setService(null);
@@ -104,18 +104,18 @@ public class MybatisGeneratorUtils {
             cfg.setFileOutConfigList(focList);
             mpg.setCfg(cfg);
             tc.setXml(null);
-        } else if ("usky-power-model".equals(model)) {
+        } else if ("fiveep-model".equals(model)) {
             tc.setController(null);
             tc.setService(null);
             tc.setServiceImpl(null);
             tc.setMapper(null);
             tc.setXml(null);
-        } else if ("usky-power-service".equals(model)) {
+        } else if ("fiveep-service".equals(model)) {
             tc.setController(null);
             tc.setMapper(null);
             tc.setXml(null);
             tc.setEntity(null);
-        } else if ("usky-power-controller".equals(model)) {
+        } else if ("fiveep-controller".equals(model)) {
             tc.setMapper(null);
             tc.setXml(null);
             tc.setService(null);

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

@@ -0,0 +1,21 @@
+package com.bizmatics.controller.web;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.stereotype.Controller;
+
+/**
+ * <p>
+ * 平台信息表 前端控制器
+ * </p>
+ *
+ * @author ya
+ * @since 2022-05-18
+ */
+@Controller
+@RequestMapping("/sysPlatform")
+public class SysPlatformController {
+
+}
+

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

@@ -7,6 +7,7 @@ import com.bizmatics.model.SysTenant;
 import com.bizmatics.model.SysTenantConfig;
 import com.bizmatics.model.vo.SysTenantConfigVo;
 import com.bizmatics.model.vo.SysTenantOneVo;
+import com.bizmatics.model.vo.SysTenantTwoVo;
 import com.bizmatics.service.PatrolInspectionDeviceService;
 import com.bizmatics.service.SysTenantConfigService;
 import com.bizmatics.service.SysTenantService;
@@ -63,7 +64,7 @@ public class SysTenantConfigController {
      * @return
      */
     @PostMapping("getTenantData")
-    public ApiResult<CommonPage<SysTenant>> getTenantData(@RequestBody SysTenantOneVo sysTenantOneVo) {
+    public ApiResult<CommonPage<SysTenantTwoVo>> getTenantData(@RequestBody SysTenantOneVo sysTenantOneVo) {
         return ApiResult.success(sysTenantService.getTenantData(sysTenantOneVo));
     }
 

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

@@ -3,11 +3,12 @@ package com.bizmatics.controller.web;
 
 import com.bizmatics.common.core.bean.ApiResult;
 import com.bizmatics.common.core.bean.CommonPage;
+import com.bizmatics.model.SysPlatform;
 import com.bizmatics.model.SysTenant;
 import com.bizmatics.model.vo.SysTenantOneVo;
-import com.bizmatics.model.vo.SysTenantVo;
+import com.bizmatics.model.vo.SysTenantTwoVo;
+import com.bizmatics.service.SysPlatformService;
 import com.bizmatics.service.SysTenantService;
-import com.bizmatics.service.system.ISysUserService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -26,20 +27,25 @@ public class TenantConfigController {
     @Autowired
     private SysTenantService sysTenantService;
 
+    @Autowired
+    private SysPlatformService sysPlatformService;
+
 
     /**
      * 租户管理-租户单位配置-列表查询
+     *
      * @param sysTenantOneVo
      * @return
      */
     @PostMapping("getTenantData")
-    public ApiResult<CommonPage<SysTenant>> getTenantData(@RequestBody SysTenantOneVo sysTenantOneVo) {
+    public ApiResult<CommonPage<SysTenantTwoVo>> getTenantData(@RequestBody SysTenantOneVo sysTenantOneVo) {
         return ApiResult.success(sysTenantService.getTenantData(sysTenantOneVo));
     }
 
 
     /**
      * 租户管理-租户单位配置-新增
+     *
      * @param sysTenant
      * @return
      */
@@ -51,6 +57,7 @@ public class TenantConfigController {
 
     /**
      * 租户管理-租户单位配置-修改
+     *
      * @param sysTenant
      * @return
      */
@@ -60,5 +67,15 @@ public class TenantConfigController {
         return ApiResult.success();
     }
 
+
+    /**
+     * 租户管理-租户单位配置-系统平台下拉框数据查询
+     * @return
+     */
+    @GetMapping("/getPlatformBoxList")
+    public ApiResult<List<SysPlatform>> getPlatformBoxList() {
+        return ApiResult.success(sysPlatformService.getPlatformBoxList());
+    }
+
 }
 

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

@@ -8,6 +8,7 @@ import com.bizmatics.controller.web.system.BaseController;
 import com.bizmatics.model.SysTenant;
 import com.bizmatics.model.constants.UserConstants;
 import com.bizmatics.model.system.SysUser;
+import com.bizmatics.model.vo.SysTenantTwoVo;
 import com.bizmatics.service.SysTenantService;
 import com.bizmatics.service.system.ISysUserService;
 import com.bizmatics.service.util.SecurityUtils;
@@ -157,10 +158,10 @@ public class UserConfigController extends BaseController {
      * @return
      */
     @GetMapping("getTenantDataOne")
-    public ApiResult<CommonPage<SysTenant>> getTenantDataOne(@RequestParam(value = "tenantName", required = false) String tenantName,
-                                                             @RequestParam(value = "tenantManager", required = false) String tenantManager,
-                                                             @RequestParam(value = "page", required = false, defaultValue = "0") Integer page,
-                                                             @RequestParam(value = "size", required = false, defaultValue = "0") Integer size) {
+    public ApiResult<CommonPage<SysTenantTwoVo>> getTenantDataOne(@RequestParam(value = "tenantName", required = false) String tenantName,
+                                                                  @RequestParam(value = "tenantManager", required = false) String tenantManager,
+                                                                  @RequestParam(value = "page", required = false, defaultValue = "0") Integer page,
+                                                                  @RequestParam(value = "size", required = false, defaultValue = "0") Integer size) {
         return ApiResult.success(sysTenantService.getTenantDataOne(tenantName, tenantManager, page, size));
     }
 

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

@@ -0,0 +1,75 @@
+package com.bizmatics.model;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import com.baomidou.mybatisplus.annotation.TableField;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 平台信息表
+ * </p>
+ *
+ * @author ya
+ * @since 2022-05-18
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class SysPlatform implements Serializable {
+
+    private static final long serialVersionUID=1L;
+
+    /**
+     * 主键ID
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 平台名称
+     */
+    private String platformName;
+
+    /**
+     * 平台状态（0 停用 1 启用）
+     */
+    private String status;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 创建者
+     */
+    private String createBy;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createTime;
+
+    /**
+     * 更新者
+     */
+    private String updateBy;
+
+    /**
+     * 更新时间
+     */
+    private LocalDateTime updateTime;
+
+    /**
+     * 激活码
+     */
+    @TableField("tenantKey")
+    private String tenantKey;
+
+
+}

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

@@ -0,0 +1,124 @@
+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 SysTenantTwoVo implements Serializable {
+
+    private static final long serialVersionUID=1L;
+
+    /**
+     * 租户ID
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 租户编号
+     */
+    private String tenantCode;
+
+    /**
+     * 租户名称
+     */
+    private String tenantName;
+
+    /**
+     * 租户负责人
+     */
+    private String tenantManager;
+
+    /**
+     * 租户类型（0 试用租户  1 正式租户）
+     */
+    private String tenantType;
+
+    /**
+     * 租户站点域名
+     */
+    private String domain;
+
+    /**
+     * 租户邮箱
+     */
+    private String email;
+
+    /**
+     * 手机号码
+     */
+    private String phoneNumber;
+
+    /**
+     * 联系地址
+     */
+    private String address;
+
+    /**
+     * 地理位置
+     */
+    private String geoPosition;
+
+    /**
+     * 有效期限
+     */
+    private String tenantTerm;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 租户状态（0正常 1停用）
+     */
+    private String status;
+
+    /**
+     * 创建者
+     */
+    private String createBy;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createTime;
+
+    /**
+     * 更新者
+     */
+    private String updateBy;
+
+    /**
+     * 更新时间
+     */
+    private LocalDateTime updateTime;
+
+    /**
+     * 系统ID
+     */
+    private String systemName;
+
+
+    /**
+     * 系统名称
+     */
+    private String platformName;
+
+}

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

@@ -0,0 +1,16 @@
+package com.bizmatics.persistence.mapper;
+
+import com.bizmatics.model.SysPlatform;
+import com.bizmatics.common.mvc.base.CrudMapper;
+
+/**
+ * <p>
+ * 平台信息表 Mapper 接口
+ * </p>
+ *
+ * @author ya
+ * @since 2022-05-18
+ */
+public interface SysPlatformMapper extends CrudMapper<SysPlatform> {
+
+}

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

@@ -3,6 +3,7 @@ package com.bizmatics.persistence.mapper;
 import com.bizmatics.model.SysTenant;
 import com.bizmatics.common.mvc.base.CrudMapper;
 import com.bizmatics.model.vo.SiteListVo;
+import com.bizmatics.model.vo.SysTenantTwoVo;
 import com.bizmatics.model.vo.SysTenantVo;
 import org.apache.ibatis.annotations.Param;
 
@@ -20,17 +21,17 @@ 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,
-                                  @Param("id") Integer id);
+    List<SysTenantTwoVo> 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,
+                                       @Param("id") Integer id);
 
-    List<SysTenant> getTenantDataOne(@Param("tenantName") String tenantName,
+    List<SysTenantTwoVo> getTenantDataOne(@Param("tenantName") String tenantName,
                                      @Param("tenantManager") String tenantManager,
                                      @Param("current") Integer current,
                                      @Param("size") Integer size);

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

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.bizmatics.persistence.mapper.SysPlatformMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.bizmatics.model.SysPlatform">
+        <id column="id" property="id" />
+        <result column="platform_name" property="platformName" />
+        <result column="status" property="status" />
+        <result column="remark" property="remark" />
+        <result column="create_by" property="createBy" />
+        <result column="create_time" property="createTime" />
+        <result column="update_by" property="updateBy" />
+        <result column="update_time" property="updateTime" />
+        <result column="tenantKey" property="tenantKey" />
+    </resultMap>
+
+</mapper>

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

@@ -35,29 +35,29 @@
         </where>
     </select>
 
-    <select id="getTenantData" resultType="com.bizmatics.model.SysTenant">
+    <select id="getTenantData" resultType="com.bizmatics.model.vo.SysTenantTwoVo">
         SELECT
-        *
+        a.*,b.platform_name
         FROM
-        sys_tenant
+        sys_tenant as a left join sys_platform as b on a.system_name=b.id
         <where>
             <if test="id != null and id != '' and id!=0">
-                and id = #{id}
+                and a.id = #{id}
             </if>
             <if test="tenantName != null and tenantName != ''">
-                and tenant_name LIKE CONCAT(CONCAT('%', #{tenantName}), '%')
+                and a.tenant_name LIKE CONCAT(CONCAT('%', #{tenantName}), '%')
             </if>
             <if test="tenantManager != null and tenantManager != ''">
-                and tenant_manager LIKE CONCAT(CONCAT('%', #{tenantManager}), '%')
+                and a.tenant_manager LIKE CONCAT(CONCAT('%', #{tenantManager}), '%')
             </if>
             <if test="tenantType != null and tenantType != ''">
-                and tenant_type = #{tenantType}
+                and a.tenant_type = #{tenantType}
             </if>
             <if test="status != null and status != ''">
-                and status = #{status}
+                and a.status = #{status}
             </if>
             <if test="endTime != null and startTime != null and endTime != '' and startTime != ''">
-                and tenant_term BETWEEN #{startTime} and #{endTime}
+                and a.tenant_term BETWEEN #{startTime} and #{endTime}
             </if>
         </where>
         <if test="current != null and size != null and size != 0">
@@ -65,17 +65,17 @@
         </if>
     </select>
 
-    <select id="getTenantDataOne" resultType="com.bizmatics.model.SysTenant">
+    <select id="getTenantDataOne" resultType="com.bizmatics.model.vo.SysTenantTwoVo">
         SELECT
-        *
+        a.*,b.platform_name
         FROM
-        sys_tenant
+        sys_tenant as a left join sys_platform as b on a.system_name=b.id
         <where>
             <if test="tenantName != null and tenantName != ''">
-                and tenant_name LIKE CONCAT(CONCAT('%', #{tenantName}), '%')
+                and a.tenant_name LIKE CONCAT(CONCAT('%', #{tenantName}), '%')
             </if>
             <if test="tenantManager != null and tenantManager != ''">
-                and tenant_manager LIKE CONCAT(CONCAT('%', #{tenantManager}), '%')
+                and a.tenant_manager LIKE CONCAT(CONCAT('%', #{tenantManager}), '%')
             </if>
         </where>
         <if test="current != null and size != null and size != 0">

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

@@ -0,0 +1,18 @@
+package com.bizmatics.service;
+
+import com.bizmatics.model.SysPlatform;
+import com.bizmatics.common.mvc.base.CrudService;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 平台信息表 服务类
+ * </p>
+ *
+ * @author ya
+ * @since 2022-05-18
+ */
+public interface SysPlatformService extends CrudService<SysPlatform> {
+    List<SysPlatform> getPlatformBoxList();
+}

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

@@ -5,6 +5,7 @@ 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.SysTenantTwoVo;
 import com.bizmatics.model.vo.SysTenantVo;
 
 import java.util.List;
@@ -20,12 +21,12 @@ import java.util.List;
 public interface SysTenantService extends CrudService<SysTenant> {
     List<SysTenantVo> getUserData();
 
-    CommonPage<SysTenant> getTenantData(SysTenantOneVo sysTenantOneVo);
+    CommonPage<SysTenantTwoVo> getTenantData(SysTenantOneVo sysTenantOneVo);
 
     void addTenantData(SysTenant sysTenant);
 
     void updateTenantData(SysTenant sysTenant);
 
-    CommonPage<SysTenant> getTenantDataOne(String tenantName, String tenantManager, Integer page, Integer size);
+    CommonPage<SysTenantTwoVo> getTenantDataOne(String tenantName, String tenantManager, Integer page, Integer size);
 
 }

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

@@ -0,0 +1,35 @@
+package com.bizmatics.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.bizmatics.common.core.exception.BusinessException;
+import com.bizmatics.model.SysPlatform;
+import com.bizmatics.model.SysTenantConfig;
+import com.bizmatics.model.system.SysUser;
+import com.bizmatics.persistence.mapper.SysPlatformMapper;
+import com.bizmatics.service.SysPlatformService;
+import com.bizmatics.common.mvc.base.AbstractCrudService;
+import com.bizmatics.service.util.SecurityUtils;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 平台信息表 服务实现类
+ * </p>
+ *
+ * @author ya
+ * @since 2022-05-18
+ */
+@Service
+public class SysPlatformServiceImpl extends AbstractCrudService<SysPlatformMapper, SysPlatform> implements SysPlatformService {
+
+    @Override
+    public List<SysPlatform> getPlatformBoxList() {
+        LambdaQueryWrapper<SysPlatform> queryWrapper = Wrappers.lambdaQuery();
+        queryWrapper.eq(SysPlatform::getStatus, "1");
+        List<SysPlatform> list = this.list(queryWrapper);
+        return list;
+    }
+}

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

@@ -5,6 +5,7 @@ import com.bizmatics.common.mvc.base.AbstractCrudService;
 import com.bizmatics.model.SysTenant;
 import com.bizmatics.model.system.SysUser;
 import com.bizmatics.model.vo.SysTenantOneVo;
+import com.bizmatics.model.vo.SysTenantTwoVo;
 import com.bizmatics.model.vo.SysTenantVo;
 import com.bizmatics.persistence.mapper.SysTenantMapper;
 import com.bizmatics.service.SysTenantService;
@@ -41,8 +42,8 @@ public class SysTenantServiceImpl extends AbstractCrudService<SysTenantMapper, S
      * @return
      */
     @Override
-    public CommonPage<SysTenant> getTenantData(SysTenantOneVo sysTenantOneVo) {
-        List<SysTenant> list1 = baseMapper.getTenantData(sysTenantOneVo.getTenantName(),
+    public CommonPage<SysTenantTwoVo> getTenantData(SysTenantOneVo sysTenantOneVo) {
+        List<SysTenantTwoVo> list1 = baseMapper.getTenantData(sysTenantOneVo.getTenantName(),
                 sysTenantOneVo.getTenantManager(),
                 sysTenantOneVo.getTenantType(),
                 sysTenantOneVo.getStatus(),
@@ -56,7 +57,7 @@ public class SysTenantServiceImpl extends AbstractCrudService<SysTenantMapper, S
         if (sysTenantOneVo.getPage() != null && sysTenantOneVo.getSize() > 0) {
             current = (sysTenantOneVo.getPage() - 1) * sysTenantOneVo.getSize();
         }
-        List<SysTenant> list = baseMapper.getTenantData(sysTenantOneVo.getTenantName(),
+        List<SysTenantTwoVo> list = baseMapper.getTenantData(sysTenantOneVo.getTenantName(),
                 sysTenantOneVo.getTenantManager(),
                 sysTenantOneVo.getTenantType(),
                 sysTenantOneVo.getStatus(),
@@ -91,8 +92,8 @@ public class SysTenantServiceImpl extends AbstractCrudService<SysTenantMapper, S
 
 
     @Override
-    public CommonPage<SysTenant> getTenantDataOne(String tenantName, String tenantManager, Integer page, Integer size) {
-        List<SysTenant> list1 = baseMapper.getTenantDataOne(tenantName, tenantManager, null, null);
+    public CommonPage<SysTenantTwoVo> getTenantDataOne(String tenantName, String tenantManager, Integer page, Integer size) {
+        List<SysTenantTwoVo> list1 = baseMapper.getTenantDataOne(tenantName, tenantManager, null, null);
         int total = 0;
         if (list1.size() > 0) {
             total = list1.size();
@@ -101,7 +102,7 @@ public class SysTenantServiceImpl extends AbstractCrudService<SysTenantMapper, S
         if (page != null && size > 0) {
             current = (page - 1) * size;
         }
-        List<SysTenant> list = baseMapper.getTenantDataOne(tenantName, tenantManager, current, size);
+        List<SysTenantTwoVo> list = baseMapper.getTenantDataOne(tenantName, tenantManager, current, size);
         return new CommonPage<>(list, total, size, page);
     }
 }