租户列表的提交

commons/src/main/java/com/jzg/config/MultiTenantHandler.java

@@ -35,7 +35,6 @@ public class MultiTenantHandler implements TenantLineHandler {
     @Override
     public Expression getTenantId() {
         // 实际应该从用户信息中获取，框架一般都有获取用户信息的接口
-        String userName = controller.getUserName();
         String tenant_id = controller.getUserLoginSystem();
         // 判空校验
         if (StringUtil.isNotEmpty(tenant_id)) {
@@ -72,7 +71,7 @@ public class MultiTenantHandler implements TenantLineHandler {
         // 可以自行增加一些校验比如获取不到用户就直接 return false 之类的。
         List<String> ignoreLoginNames = properties.getIgnoreLoginNames();
         // 忽略指定用户对租户的数据过滤
-        String username = "";
+        String username = controller.getUserName();
         if (null != ignoreLoginNames && ignoreLoginNames.contains(username)) {
             return true;
         }

platform/src/main/java/com/jzg/controller/SysSystemController.java

@@ -1,23 +1,28 @@
 package com.jzg.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.jzg.annotation.Log;
 import com.jzg.core.page.HttpResult;
+import com.jzg.entity.enums.BusinessType;
 import com.jzg.entity.vo.SysRoleVo;
 import com.jzg.entity.vo.SysSystemVo;
 import com.jzg.service.SysSystemService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.List;
+
 /**
  * 租户管理接口
  *
  * @author dongxin
  */
-@Tag(name="租户接口")
+@Tag(name="租户管理")
 @RestController
-@RequestMapping("/sys/system")
+@RequestMapping("/system")
 public class SysSystemController {
 
     @Autowired
@@ -28,11 +33,44 @@ public class SysSystemController {
      * @param sysSystemVo
      * @return
      */
-    @PostMapping("page")
-    @Operation(summary = "租户分页列表")
-    public HttpResult page(@RequestBody SysSystemVo sysSystemVo){
+    @PostMapping("/sysList")
+    @Operation(summary = "租户列表")
+    public HttpResult sysList(@RequestBody SysSystemVo sysSystemVo){
         Page page = sysSystemVo.getPage();
         return HttpResult.ok(sysSystemService.queryPage(page,sysSystemVo));
     }
 
+    /**
+     * 根据ID获取租户详情
+     * @param id
+     * @return
+     */
+    @GetMapping(value = { "/sysGet"})
+    @Operation(summary = "根据id获取租户详情")
+    public HttpResult sysGet(@RequestBody String id) {
+        return HttpResult.ok(sysSystemService.queryById(id));
+    }
+
+//    @Log(title = "租户管理", businessType = BusinessType.INSERT)
+//    @PostMapping
+//    public HttpResult add(@Validated @RequestBody SysSystemVo sysSystemVo) {
+//
+//
+//        deptService.checkDeptDataScope(user.getDeptId());
+//        if (!userService.checkUserNameUnique(user)) {
+//            return R.fail("新增用户'" + user.getUserName() + "'失败，登录账号已存在");
+//        } else if (StringUtils.isNotEmpty(user.getPhonenumber()) && !userService.checkPhoneUnique(user)) {
+//            return R.fail("新增用户'" + user.getUserName() + "'失败，手机号码已存在");
+//        } else if (StringUtils.isNotEmpty(user.getEmail()) && !userService.checkEmailUnique(user)) {
+//            return R.fail("新增用户'" + user.getUserName() + "'失败，邮箱账号已存在");
+//        }
+//        if (TenantHelper.isEnable()) {
+//            if (!tenantService.checkAccountBalance(TenantHelper.getTenantId())) {
+//                return R.fail("当前租户下用户名额不足，请联系管理员");
+//            }
+//        }
+//        user.setPassword(BCrypt.hashpw(user.getPassword()));
+//        return toAjax(userService.insertUser(user));
+//    }
+
 }

platform/src/main/java/com/jzg/entity/po/SysOperLog.java

@@ -15,7 +15,7 @@ import java.util.Date;
 public class SysOperLog {
 
     /** 日志主键 */
-    private Long operId;
+    private String Id;
 
     /** 操作模块 */
     private String title;

platform/src/main/java/com/jzg/entity/po/SysSystem.java

@@ -14,7 +14,7 @@ import lombok.Data;
 @Data
 public class SysSystem extends BaseModel {
     /** 租户id */
-    private String sysId;
+    private String id;
 
     /** 租户Code */
     private String sysCode;

platform/src/main/java/com/jzg/entity/vo/SysSystemVo.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.jzg.core.base.PageRequest;
 import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotNull;
 import lombok.Data;
 
 @Schema(description = "租户表VO")
@@ -13,6 +14,21 @@ public class SysSystemVo extends PageRequest {
     @Schema(description = "租户id")
     private String id;
 
+    /** 租户Code */
+    @Schema(description = "租户code")
+    @NotNull(message = "租户编码不能为空")
+    private String sysCode;
+
+    /** 租户名称 */
+    @Schema(description = "租户名称")
+    @NotNull(message = "租户名称不能为空")
+    private String sysName;
+
+    /** 租户名称 */
+    @Schema(description = "租户简称")
+    @NotNull(message = "租户简称不能为空")
+    private String shortName;
+
     /** 省 */
     @Schema(description = "省id")
     private String provinceId;

platform/src/main/java/com/jzg/service/SysSystemService.java

@@ -33,4 +33,11 @@ public interface SysSystemService extends IService<SysSystem> {
      * @return
      */
     Page<SysSystem> queryPage(Page page, SysSystemVo sysSystemVo);
+
+    /**
+     *
+     * @param sysId
+     * @return
+     */
+    String queryById(String sysId);
 }

platform/src/main/java/com/jzg/service/impl/SysSystemServiceImpl.java

@@ -58,6 +58,11 @@ public class SysSystemServiceImpl extends ServiceImpl<SysSystemMapper, SysSystem
         return sysPage;
     }
 
+    @Override
+    public String queryById(String sysId) {
+        return "";
+    }
+
 }
 
 

platform/src/main/resources/mapper/SysOperLogMapper.xml

@@ -5,7 +5,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 <mapper namespace="com.jzg.mapper.SysOperLogMapper">
 
 	<resultMap type="com.jzg.entity.po.SysOperLog" id="SysOperLogResult">
-		<id     property="operId"         column="oper_id"        />
+		<id     property="id"         column="id"        />
 		<result property="title"          column="title"          />
 		<result property="businessType"   column="business_type"  />
 		<result property="method"         column="method"         />
@@ -25,7 +25,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	</resultMap>
 
 	<sql id="selectOperLogVo">
-        select oper_id, title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_location, oper_param, json_result, status, error_msg, oper_time, cost_time
+        select id, title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_location, oper_param, json_result, status, error_msg, oper_time, cost_time
         from sys_oper_log
     </sql>
     
@@ -65,11 +65,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 				AND oper_time &lt;= #{params.endTime}
 			</if>
 		</where>
-		order by oper_id desc
+		order by id desc
 	</select>
 	
 	<delete id="deleteOperLogByIds" parameterType="Long">
- 		delete from sys_oper_log where oper_id in
+ 		delete from sys_oper_log where id in
  		<foreach collection="array" item="operId" open="(" separator="," close=")">
  			#{operId}
         </foreach> 
@@ -77,7 +77,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  	
  	<select id="selectOperLogById" parameterType="Long" resultMap="SysOperLogResult">
 		<include refid="selectOperLogVo"/>
-		where oper_id = #{operId}
+		where id = #{operId}
 	</select>
 	
 	<update id="cleanOperLog">

platform/src/main/resources/mapper/SysRoleMapper.xml

@@ -21,7 +21,7 @@
 
     <select id="getAllRoleMenu" resultMap="RoleMenuMap">
         SELECT
-            ss.sys_id,
+            ss.id,
             ss.sys_code as systemCode,
             ss.sys_name as systemName,
             sr.id as roleId,
@@ -34,4 +34,4 @@
                 LEFT JOIN sys_role sr ON sr.system_code = ss.sys_code
                 LEFT JOIN sys_role_perms srp ON sr.id = srp.role_id
     </select>
-</mapper>
+</mapper>

platform/src/main/resources/mapper/SysSystemMapper.xml

@@ -5,7 +5,7 @@
 <mapper namespace="com.jzg.mapper.SysSystemMapper">
 
     <resultMap id="SysSystemResult" type="com.jzg.entity.po.SysSystem">
-            <id property="sysId" column="sys_id" jdbcType="BIGINT"/>
+            <id property="id" column="id" jdbcType="VARCHAR"/>
             <result property="sysCode" column="sys_code" jdbcType="VARCHAR"/>
             <result property="sysName" column="sys_name" jdbcType="VARCHAR"/>
             <result property="shortName" column="short_name" jdbcType="VARCHAR"/>
@@ -29,7 +29,7 @@
     </resultMap>
 
     <sql id="selectSystemVo">
-        select sys_id,sys_code,sys_name,
+        select id,sys_code,sys_name,
                short_name,sys_icon,sys_type,
                available,province_id,city_id,
                district_id,address,contact,