给租户增加字段

jshERP-boot/docs/jsh_erp.sql

@@ -833,16 +833,17 @@ CREATE TABLE `jsh_tenant` (
   `tenant_id` bigint(20) DEFAULT NULL COMMENT '用户id',
   `login_name` varchar(255) DEFAULT NULL COMMENT '登录名',
   `user_num_limit` int(11) DEFAULT NULL COMMENT '用户数量限制',
-  `bills_num_limit` int(11) DEFAULT NULL COMMENT '单据数量限制',
+  `type` varchar(1) DEFAULT '0' COMMENT '租户类型，0免费用户，1付费用户',
   `enabled` bit(1) DEFAULT b'1' COMMENT '启用 0-禁用  1-启用',
   `create_time` datetime DEFAULT NULL COMMENT '创建时间',
+  `expire_time` datetime DEFAULT NULL COMMENT '到期时间',
   PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=21 DEFAULT CHARSET=utf8 COMMENT='租户';
+) ENGINE=InnoDB AUTO_INCREMENT=14 DEFAULT CHARSET=utf8 COMMENT='租户';
 
 -- ----------------------------
 -- Records of jsh_tenant
 -- ----------------------------
-INSERT INTO `jsh_tenant` VALUES ('13', '63', 'jsh', '20', '2000', '
', '2021-02-17 23:19:17');
+INSERT INTO `jsh_tenant` VALUES ('13', '63', 'jsh', '20', '0', '
', '2021-02-17 23:19:17', '2099-02-17 23:19:17');
 
 -- ----------------------------
 -- Table structure for jsh_unit

jshERP-boot/docs/数据库更新记录-首次安装请勿使用.txt

@@ -1181,7 +1181,7 @@ alter table jsh_depot_item drop column other_field5;
 -- --------------------------------------------------------
 -- 时间 2021年7月27日
 -- by jishenghua
--- 移除机构表的全名字段
+-- 给单据子表加sku字段
 -- --------------------------------------------------------
 alter table jsh_depot_item add sku varchar(50) DEFAULT NULL COMMENT '多属性' after material_unit;
 
@@ -1191,3 +1191,13 @@ alter table jsh_depot_item add sku varchar(50) DEFAULT NULL COMMENT '多属性'
 -- 增加调拨明细菜单
 -- --------------------------------------------------------
 INSERT INTO `jsh_function` VALUES ('248', '030150', '调拨明细', '0301', '/report/allocation_detail', '/report/AllocationDetail', '\0', '0646', '
', '电脑版', '', 'profile', '0');
+
+-- --------------------------------------------------------
+-- 时间 2021年8月24日
+-- by jishenghua
+-- 给租户表加sku字段
+-- 给租户表移除单据数量限制字段
+-- --------------------------------------------------------
+alter table jsh_tenant add type varchar(1) DEFAULT '0' COMMENT '租户类型，0免费用户，1付费用户' after bills_num_limit;
+alter table jsh_tenant drop column bills_num_limit;
+alter table jsh_tenant add expire_time datetime DEFAULT NULL COMMENT '到期时间' after create_time;
\ No newline at end of file

jshERP-boot/src/main/java/com/jsh/erp/controller/DepotHeadController.java

@@ -313,14 +313,7 @@ public class DepotHeadController {
         JSONObject result = ExceptionConstants.standardSuccess();
         String beanJson = body.getInfo();
         String rows = body.getRows();
-        Long billsNumLimit = Long.parseLong(redisService.getObjectFromSessionByKey(request,"billsNumLimit").toString());
-        Long count = depotHeadService.countDepotHead(null,null,null,null,null,null,null,null,null,null,null);
-        if(count>= billsNumLimit) {
-            throw new BusinessParamCheckingException(ExceptionConstants.DEPOT_HEAD_OVER_LIMIT_FAILED_CODE,
-                    ExceptionConstants.DEPOT_HEAD_OVER_LIMIT_FAILED_MSG);
-        } else {
-            depotHeadService.addDepotHeadAndDetail(beanJson,rows, request);
-        }
+        depotHeadService.addDepotHeadAndDetail(beanJson, rows, request);
         return result;
     }
 

jshERP-boot/src/main/java/com/jsh/erp/controller/UserController.java

@@ -123,10 +123,8 @@ public class UserController {
                         if(tenant!=null) {
                             Long tenantId = tenant.getTenantId();
                             Integer userNumLimit = tenant.getUserNumLimit();
-                            Integer billsNumLimit = tenant.getBillsNumLimit();
                             if(tenantId!=null) {
                                 redisService.storageObjectBySession(token,"userNumLimit",userNumLimit); //用户限制数
-                                redisService.storageObjectBySession(token,"billsNumLimit",billsNumLimit); //单据限制数
                             }
                         }
                     }

jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/Tenant.java

@@ -11,12 +11,14 @@ public class Tenant {
 
     private Integer userNumLimit;
 
-    private Integer billsNumLimit;
+    private String type;
 
     private Boolean enabled;
 
     private Date createTime;
 
+    private Date expireTime;
+
     public Long getId() {
         return id;
     }
@@ -49,12 +51,12 @@ public class Tenant {
         this.userNumLimit = userNumLimit;
     }
 
-    public Integer getBillsNumLimit() {
-        return billsNumLimit;
+    public String getType() {
+        return type;
     }
 
-    public void setBillsNumLimit(Integer billsNumLimit) {
-        this.billsNumLimit = billsNumLimit;
+    public void setType(String type) {
+        this.type = type == null ? null : type.trim();
     }
 
     public Boolean getEnabled() {
@@ -72,4 +74,12 @@ public class Tenant {
     public void setCreateTime(Date createTime) {
         this.createTime = createTime;
     }
+
+    public Date getExpireTime() {
+        return expireTime;
+    }
+
+    public void setExpireTime(Date expireTime) {
+        this.expireTime = expireTime;
+    }
 }
\ No newline at end of file

jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/TenantEx.java

@@ -4,6 +4,8 @@ public class TenantEx extends Tenant{
 
     private String createTimeStr;
 
+    private String expireTimeStr;
+
     public String getCreateTimeStr() {
         return createTimeStr;
     }
@@ -11,4 +13,12 @@ public class TenantEx extends Tenant{
     public void setCreateTimeStr(String createTimeStr) {
         this.createTimeStr = createTimeStr;
     }
+
+    public String getExpireTimeStr() {
+        return expireTimeStr;
+    }
+
+    public void setExpireTimeStr(String expireTimeStr) {
+        this.expireTimeStr = expireTimeStr;
+    }
 }
\ No newline at end of file

jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/TenantExample.java

@@ -355,63 +355,73 @@ public class TenantExample {
             return (Criteria) this;
         }
 
-        public Criteria andBillsNumLimitIsNull() {
-            addCriterion("bills_num_limit is null");
+        public Criteria andTypeIsNull() {
+            addCriterion("type is null");
             return (Criteria) this;
         }
 
-        public Criteria andBillsNumLimitIsNotNull() {
-            addCriterion("bills_num_limit is not null");
+        public Criteria andTypeIsNotNull() {
+            addCriterion("type is not null");
             return (Criteria) this;
         }
 
-        public Criteria andBillsNumLimitEqualTo(Integer value) {
-            addCriterion("bills_num_limit =", value, "billsNumLimit");
+        public Criteria andTypeEqualTo(String value) {
+            addCriterion("type =", value, "type");
             return (Criteria) this;
         }
 
-        public Criteria andBillsNumLimitNotEqualTo(Integer value) {
-            addCriterion("bills_num_limit <>", value, "billsNumLimit");
+        public Criteria andTypeNotEqualTo(String value) {
+            addCriterion("type <>", value, "type");
             return (Criteria) this;
         }
 
-        public Criteria andBillsNumLimitGreaterThan(Integer value) {
-            addCriterion("bills_num_limit >", value, "billsNumLimit");
+        public Criteria andTypeGreaterThan(String value) {
+            addCriterion("type >", value, "type");
             return (Criteria) this;
         }
 
-        public Criteria andBillsNumLimitGreaterThanOrEqualTo(Integer value) {
-            addCriterion("bills_num_limit >=", value, "billsNumLimit");
+        public Criteria andTypeGreaterThanOrEqualTo(String value) {
+            addCriterion("type >=", value, "type");
             return (Criteria) this;
         }
 
-        public Criteria andBillsNumLimitLessThan(Integer value) {
-            addCriterion("bills_num_limit <", value, "billsNumLimit");
+        public Criteria andTypeLessThan(String value) {
+            addCriterion("type <", value, "type");
             return (Criteria) this;
         }
 
-        public Criteria andBillsNumLimitLessThanOrEqualTo(Integer value) {
-            addCriterion("bills_num_limit <=", value, "billsNumLimit");
+        public Criteria andTypeLessThanOrEqualTo(String value) {
+            addCriterion("type <=", value, "type");
             return (Criteria) this;
         }
 
-        public Criteria andBillsNumLimitIn(List<Integer> values) {
-            addCriterion("bills_num_limit in", values, "billsNumLimit");
+        public Criteria andTypeLike(String value) {
+            addCriterion("type like", value, "type");
             return (Criteria) this;
         }
 
-        public Criteria andBillsNumLimitNotIn(List<Integer> values) {
-            addCriterion("bills_num_limit not in", values, "billsNumLimit");
+        public Criteria andTypeNotLike(String value) {
+            addCriterion("type not like", value, "type");
             return (Criteria) this;
         }
 
-        public Criteria andBillsNumLimitBetween(Integer value1, Integer value2) {
-            addCriterion("bills_num_limit between", value1, value2, "billsNumLimit");
+        public Criteria andTypeIn(List<String> values) {
+            addCriterion("type in", values, "type");
             return (Criteria) this;
         }
 
-        public Criteria andBillsNumLimitNotBetween(Integer value1, Integer value2) {
-            addCriterion("bills_num_limit not between", value1, value2, "billsNumLimit");
+        public Criteria andTypeNotIn(List<String> values) {
+            addCriterion("type not in", values, "type");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeBetween(String value1, String value2) {
+            addCriterion("type between", value1, value2, "type");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeNotBetween(String value1, String value2) {
+            addCriterion("type not between", value1, value2, "type");
             return (Criteria) this;
         }
 
@@ -534,6 +544,66 @@ public class TenantExample {
             addCriterion("create_time not between", value1, value2, "createTime");
             return (Criteria) this;
         }
+
+        public Criteria andExpireTimeIsNull() {
+            addCriterion("expire_time is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andExpireTimeIsNotNull() {
+            addCriterion("expire_time is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andExpireTimeEqualTo(Date value) {
+            addCriterion("expire_time =", value, "expireTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andExpireTimeNotEqualTo(Date value) {
+            addCriterion("expire_time <>", value, "expireTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andExpireTimeGreaterThan(Date value) {
+            addCriterion("expire_time >", value, "expireTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andExpireTimeGreaterThanOrEqualTo(Date value) {
+            addCriterion("expire_time >=", value, "expireTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andExpireTimeLessThan(Date value) {
+            addCriterion("expire_time <", value, "expireTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andExpireTimeLessThanOrEqualTo(Date value) {
+            addCriterion("expire_time <=", value, "expireTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andExpireTimeIn(List<Date> values) {
+            addCriterion("expire_time in", values, "expireTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andExpireTimeNotIn(List<Date> values) {
+            addCriterion("expire_time not in", values, "expireTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andExpireTimeBetween(Date value1, Date value2) {
+            addCriterion("expire_time between", value1, value2, "expireTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andExpireTimeNotBetween(Date value1, Date value2) {
+            addCriterion("expire_time not between", value1, value2, "expireTime");
+            return (Criteria) this;
+        }
     }
 
     public static class Criteria extends GeneratedCriteria {

jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/UserEx.java

@@ -24,8 +24,6 @@ public class UserEx extends User{
 
     private String userNumLimit;
 
-    private String billsNumLimit;
-
     public String getOrgAbr() {
         return orgAbr;
     }
@@ -89,12 +87,4 @@ public class UserEx extends User{
     public void setUserNumLimit(String userNumLimit) {
         this.userNumLimit = userNumLimit;
     }
-
-    public String getBillsNumLimit() {
-        return billsNumLimit;
-    }
-
-    public void setBillsNumLimit(String billsNumLimit) {
-        this.billsNumLimit = billsNumLimit;
-    }
 }

jshERP-boot/src/main/java/com/jsh/erp/service/tenant/TenantService.java

@@ -39,10 +39,6 @@ public class TenantService {
     @Value("${tenant.userNumLimit}")
     private Integer userNumLimit;
 
-    @Value("${tenant.billsNumLimit}")
-    private Integer billsNumLimit;
-
-
     public Tenant getTenant(long id)throws Exception {
         Tenant result=null;
         try{
@@ -71,6 +67,7 @@ public class TenantService {
             if (null != list) {
                 for (TenantEx tenantEx : list) {
                     tenantEx.setCreateTimeStr(Tools.getCenternTime(tenantEx.getCreateTime()));
+                    tenantEx.setExpireTimeStr(Tools.getCenternTime(tenantEx.getExpireTime()));
                 }
             }
         }catch(Exception e){
@@ -97,9 +94,6 @@ public class TenantService {
             if(tenant.getUserNumLimit()==null) {
                 tenant.setUserNumLimit(userNumLimit); //默认用户限制数量
             }
-            if(tenant.getBillsNumLimit()==null) {
-                tenant.setBillsNumLimit(billsNumLimit); //默认单据限制数量
-            }
             tenant.setCreateTime(new Date());
             result=tenantMapper.insertSelective(tenant);
         }catch(Exception e){

jshERP-boot/src/main/java/com/jsh/erp/service/user/UserService.java

@@ -517,7 +517,6 @@ public class UserService {
             tenantObj.put("tenantId", ue.getId());
             tenantObj.put("loginName",ue.getLoginName());
             tenantObj.put("userNumLimit",ue.getUserNumLimit());
-            tenantObj.put("billsNumLimit",ue.getBillsNumLimit());
             tenantService.insertTenant(tenantObj, request);
             logger.info("===============创建租户信息完成===============");
             if (result > 0) {

jshERP-boot/src/main/resources/application.properties

@@ -18,8 +18,6 @@ spring.redis.password=1234abcd
 manage.roleId=10
 #租户允许创建的用户数
 tenant.userNumLimit=1000000
-#租户允许创建的单据数
-tenant.billsNumLimit=100000000
 #演示模式开关-默认关闭:false
 demonstrate.open=false
 #插件配置

jshERP-boot/src/main/resources/mapper_xml/TenantMapper.xml

@@ -6,9 +6,10 @@
     <result column="tenant_id" jdbcType="BIGINT" property="tenantId" />
     <result column="login_name" jdbcType="VARCHAR" property="loginName" />
     <result column="user_num_limit" jdbcType="INTEGER" property="userNumLimit" />
-    <result column="bills_num_limit" jdbcType="INTEGER" property="billsNumLimit" />
+    <result column="type" jdbcType="VARCHAR" property="type" />
     <result column="enabled" jdbcType="BIT" property="enabled" />
     <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
+    <result column="expire_time" jdbcType="TIMESTAMP" property="expireTime" />
   </resultMap>
   <sql id="Example_Where_Clause">
     <where>
@@ -69,7 +70,7 @@
     </where>
   </sql>
   <sql id="Base_Column_List">
-    id, tenant_id, login_name, user_num_limit, bills_num_limit, enabled, create_time
+    id, tenant_id, login_name, user_num_limit, type, enabled, create_time, expire_time
   </sql>
   <select id="selectByExample" parameterType="com.jsh.erp.datasource.entities.TenantExample" resultMap="BaseResultMap">
     select
@@ -103,11 +104,11 @@
   </delete>
   <insert id="insert" parameterType="com.jsh.erp.datasource.entities.Tenant">
     insert into jsh_tenant (id, tenant_id, login_name, 
-      user_num_limit, bills_num_limit, enabled, 
-      create_time)
+      user_num_limit, type, enabled, 
+      create_time, expire_time)
     values (#{id,jdbcType=BIGINT}, #{tenantId,jdbcType=BIGINT}, #{loginName,jdbcType=VARCHAR}, 
-      #{userNumLimit,jdbcType=INTEGER}, #{billsNumLimit,jdbcType=INTEGER}, #{enabled,jdbcType=BIT}, 
-      #{createTime,jdbcType=TIMESTAMP})
+      #{userNumLimit,jdbcType=INTEGER}, #{type,jdbcType=VARCHAR}, #{enabled,jdbcType=BIT}, 
+      #{createTime,jdbcType=TIMESTAMP}, #{expireTime,jdbcType=TIMESTAMP})
   </insert>
   <insert id="insertSelective" parameterType="com.jsh.erp.datasource.entities.Tenant">
     insert into jsh_tenant
@@ -124,8 +125,8 @@
       <if test="userNumLimit != null">
         user_num_limit,
       </if>
-      <if test="billsNumLimit != null">
-        bills_num_limit,
+      <if test="type != null">
+        type,
       </if>
       <if test="enabled != null">
         enabled,
@@ -133,6 +134,9 @@
       <if test="createTime != null">
         create_time,
       </if>
+      <if test="expireTime != null">
+        expire_time,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="id != null">
@@ -147,8 +151,8 @@
       <if test="userNumLimit != null">
         #{userNumLimit,jdbcType=INTEGER},
       </if>
-      <if test="billsNumLimit != null">
-        #{billsNumLimit,jdbcType=INTEGER},
+      <if test="type != null">
+        #{type,jdbcType=VARCHAR},
       </if>
       <if test="enabled != null">
         #{enabled,jdbcType=BIT},
@@ -156,6 +160,9 @@
       <if test="createTime != null">
         #{createTime,jdbcType=TIMESTAMP},
       </if>
+      <if test="expireTime != null">
+        #{expireTime,jdbcType=TIMESTAMP},
+      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="com.jsh.erp.datasource.entities.TenantExample" resultType="java.lang.Long">
@@ -179,8 +186,8 @@
       <if test="record.userNumLimit != null">
         user_num_limit = #{record.userNumLimit,jdbcType=INTEGER},
       </if>
-      <if test="record.billsNumLimit != null">
-        bills_num_limit = #{record.billsNumLimit,jdbcType=INTEGER},
+      <if test="record.type != null">
+        type = #{record.type,jdbcType=VARCHAR},
       </if>
       <if test="record.enabled != null">
         enabled = #{record.enabled,jdbcType=BIT},
@@ -188,6 +195,9 @@
       <if test="record.createTime != null">
         create_time = #{record.createTime,jdbcType=TIMESTAMP},
       </if>
+      <if test="record.expireTime != null">
+        expire_time = #{record.expireTime,jdbcType=TIMESTAMP},
+      </if>
     </set>
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -199,9 +209,10 @@
       tenant_id = #{record.tenantId,jdbcType=BIGINT},
       login_name = #{record.loginName,jdbcType=VARCHAR},
       user_num_limit = #{record.userNumLimit,jdbcType=INTEGER},
-      bills_num_limit = #{record.billsNumLimit,jdbcType=INTEGER},
+      type = #{record.type,jdbcType=VARCHAR},
       enabled = #{record.enabled,jdbcType=BIT},
-      create_time = #{record.createTime,jdbcType=TIMESTAMP}
+      create_time = #{record.createTime,jdbcType=TIMESTAMP},
+      expire_time = #{record.expireTime,jdbcType=TIMESTAMP}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -218,8 +229,8 @@
       <if test="userNumLimit != null">
         user_num_limit = #{userNumLimit,jdbcType=INTEGER},
       </if>
-      <if test="billsNumLimit != null">
-        bills_num_limit = #{billsNumLimit,jdbcType=INTEGER},
+      <if test="type != null">
+        type = #{type,jdbcType=VARCHAR},
       </if>
       <if test="enabled != null">
         enabled = #{enabled,jdbcType=BIT},
@@ -227,6 +238,9 @@
       <if test="createTime != null">
         create_time = #{createTime,jdbcType=TIMESTAMP},
       </if>
+      <if test="expireTime != null">
+        expire_time = #{expireTime,jdbcType=TIMESTAMP},
+      </if>
     </set>
     where id = #{id,jdbcType=BIGINT}
   </update>
@@ -235,9 +249,10 @@
     set tenant_id = #{tenantId,jdbcType=BIGINT},
       login_name = #{loginName,jdbcType=VARCHAR},
       user_num_limit = #{userNumLimit,jdbcType=INTEGER},
-      bills_num_limit = #{billsNumLimit,jdbcType=INTEGER},
+      type = #{type,jdbcType=VARCHAR},
       enabled = #{enabled,jdbcType=BIT},
-      create_time = #{createTime,jdbcType=TIMESTAMP}
+      create_time = #{createTime,jdbcType=TIMESTAMP},
+      expire_time = #{expireTime,jdbcType=TIMESTAMP}
     where id = #{id,jdbcType=BIGINT}
   </update>
 </mapper>
\ No newline at end of file