From 3cabc89f9bbe4c0efe4ab99dd8321fd8bdcb8236 Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Tue, 23 Mar 2021 16:20:34 +0800
Subject: [PATCH] 1.还原客户信息 2.用户修改在线状态
---
blade-service/blade-user/src/main/java/org/springblade/system/user/mapper/UserMapper.xml | 2 +
blade-service/blade-system/src/main/java/org/springblade/system/mapper/TenantMapper.xml | 23 -----------
blade-service/blade-system/src/main/java/org/springblade/system/controller/TenantController.java | 45 ----------------------
blade-service-api/blade-system-api/src/main/java/org/springblade/system/entity/Tenant.java | 8 ----
blade-service-api/blade-user-api/src/main/java/org/springblade/system/user/entity/User.java | 1
5 files changed, 3 insertions(+), 76 deletions(-)
diff --git a/blade-service-api/blade-system-api/src/main/java/org/springblade/system/entity/Tenant.java b/blade-service-api/blade-system-api/src/main/java/org/springblade/system/entity/Tenant.java
index 42db503..e37db97 100644
--- a/blade-service-api/blade-system-api/src/main/java/org/springblade/system/entity/Tenant.java
+++ b/blade-service-api/blade-system-api/src/main/java/org/springblade/system/entity/Tenant.java
@@ -101,14 +101,6 @@
*/
@ApiModelProperty(value = "授权码")
private String licenseKey;
- private String type;
- private String jd;
- private String wd;
- private String types;
- private String information;
- private String province;
- private String city;
- private String district;
}
diff --git a/blade-service-api/blade-user-api/src/main/java/org/springblade/system/user/entity/User.java b/blade-service-api/blade-user-api/src/main/java/org/springblade/system/user/entity/User.java
index 576b32d..6502b6e 100644
--- a/blade-service-api/blade-user-api/src/main/java/org/springblade/system/user/entity/User.java
+++ b/blade-service-api/blade-user-api/src/main/java/org/springblade/system/user/entity/User.java
@@ -91,6 +91,7 @@
* 岗位id
*/
private String postId;
+ private String online_status;
}
diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/controller/TenantController.java b/blade-service/blade-system/src/main/java/org/springblade/system/controller/TenantController.java
index 9a1af8c..1ed526e 100644
--- a/blade-service/blade-system/src/main/java/org/springblade/system/controller/TenantController.java
+++ b/blade-service/blade-system/src/main/java/org/springblade/system/controller/TenantController.java
@@ -91,26 +91,6 @@
public R<IPage<Tenant>> list(@ApiIgnore @RequestParam Map<String, Object> tenant, Query query, BladeUser bladeUser) throws ParseException {
QueryWrapper<Tenant> queryWrapper = Condition.getQueryWrapper(tenant, Tenant.class);
IPage<Tenant> pages = tenantService.page(Condition.getPage(query), (!bladeUser.getTenantId().equals(BladeConstant.ADMIN_TENANT_ID)) ? queryWrapper.lambda().eq(Tenant::getTenantId, bladeUser.getTenantId()) : queryWrapper);
- for (int j = 0; j < pages.getRecords().size(); j++) {
- Date expireTime = pages.getRecords().get(j).getExpireTime();
- //1.获取当前时间
- Date dd = new Date();
- SimpleDateFormat sim = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
- String end = sim.format(dd);
- //把string类型转换为long类型的
-
- if (expireTime != null){
- long st = sim.parse(String.valueOf(expireTime)).getTime();
- long en = sim.parse(end).getTime();
- //计算天数
- int day = (int) ((st - en) / 86400000);
- if (day <= 30) {
- pages.getRecords().get(j).setType("1");
- } else {
- pages.getRecords().get(j).setType("0");
- }
- }
- }
return R.data(pages);
}
@@ -136,31 +116,6 @@
//@PreAuth(RoleConstant.HAS_ROLE_ADMIN)
public R<IPage<Tenant>> page(Tenant tenant, Query query) throws ParseException {
IPage<Tenant> pages = tenantService.selectTenantPage(Condition.getPage(query), tenant);
- for (int j = 0; j < pages.getRecords().size(); j++) {
- Date expireTimes = pages.getRecords().get(j).getExpireTime();
- if (expireTimes == null){
- pages.getRecords().get(j).setType("0");
- continue;
- }
- //1.获取当前时间
- Date dd = new Date();
- SimpleDateFormat sim = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
- String end = sim.format(dd);
- String expireTime = sim.format(expireTimes);
- //把string类型转换为long类型的
-
- if (expireTime != null){
- long st = sim.parse(expireTime).getTime();
- long en = sim.parse(end).getTime();
- //计算天数
- int day = (int) ((st - en) / 86400000);
- if (day <= 30) {
- pages.getRecords().get(j).setType("1");
- } else {
- pages.getRecords().get(j).setType("0");
- }
- }
- }
return R.data(pages);
}
diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/mapper/TenantMapper.xml b/blade-service/blade-system/src/main/java/org/springblade/system/mapper/TenantMapper.xml
index c7ad73a..3c94fc1 100644
--- a/blade-service/blade-system/src/main/java/org/springblade/system/mapper/TenantMapper.xml
+++ b/blade-service/blade-system/src/main/java/org/springblade/system/mapper/TenantMapper.xml
@@ -21,34 +21,11 @@
<result column="account_number" property="accountNumber"/>
<result column="expire_time" property="expireTime"/>
<result column="license_key" property="licenseKey"/>
- <result column="type" property="type"/>
- <result column="jd" property="jd"/>
- <result column="wd" property="wd"/>
- <result column="information" property="information"/>
- <result column="types" property="types"/>
- <result column="province" property="province"/>
- <result column="city" property="city"/>
- <result column="district" property="district"/>
</resultMap>
<select id="selectTenantPage" resultMap="tenantResultMap">
select * from blade_tenant where is_deleted = 0
- <if test="tenant.tenantName!=null">
- and tenant_name like concat('%',#{tenant.tenantName},'%')
- </if>
- <if test="tenant.linkman!=null">
- and linkman like concat('%',#{tenant.linkman},'%')
- </if>
- <if test="tenant.district!=null">
- and district like concat('%',#{tenant.district},'%')
- </if>
- <if test="tenant.province!=null">
- and province like concat('%',#{tenant.province},'%')
- </if>
- <if test="tenant.city!=null">
- and city like concat('%',#{tenant.city},'%')
- </if>
</select>
</mapper>
diff --git a/blade-service/blade-user/src/main/java/org/springblade/system/user/mapper/UserMapper.xml b/blade-service/blade-user/src/main/java/org/springblade/system/user/mapper/UserMapper.xml
index 0c95ce6..70b9d65 100644
--- a/blade-service/blade-user/src/main/java/org/springblade/system/user/mapper/UserMapper.xml
+++ b/blade-service/blade-user/src/main/java/org/springblade/system/user/mapper/UserMapper.xml
@@ -25,6 +25,8 @@
<result column="role_id" property="roleId"/>
<result column="dept_id" property="deptId"/>
<result column="post_id" property="postId"/>
+ <result column="online_status" property="online_status"/>
+ <result column="channlId" property="channlId"/>
</resultMap>
<select id="selectUserPage" resultMap="userResultMap">
--
Gitblit v1.9.3