From 4bd007805ce8242320c9cf4e477ce87fe1896bb6 Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Mon, 22 Mar 2021 09:38:01 +0800
Subject: [PATCH] 1.用户管理
---
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 | 51 ++++++++++++++++
blade-service-api/blade-system-api/src/main/java/org/springblade/system/entity/Tenant.java | 8 ++
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/nettyServer/ServerHandler.java | 47 ++++++++++-----
4 files changed, 111 insertions(+), 18 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 e37db97..42db503 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,6 +101,14 @@
*/
@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/blade-jfpts/src/main/java/org/springblade/jfpt/nettyServer/ServerHandler.java b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/nettyServer/ServerHandler.java
index 91a096f..8c1c349 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/nettyServer/ServerHandler.java
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/nettyServer/ServerHandler.java
@@ -457,28 +457,28 @@
} else if (fqbm.equals("3")) {
alarm.setWaringType("系统故障");
alarm.setContent("扩展模块故障");
- reason="扩展模块故障";
- serverHandler.equipmentService.updateExstate(state,reason,devId);
+// reason="扩展模块故障";
+// serverHandler.equipmentService.updateExstate(state,reason,devId);
} else if (fqbm.equals("4")) {
alarm.setWaringType("系统故障");
alarm.setContent("中继器故障");
- reason="中继器故障";
- serverHandler.equipmentService.updateExstate(state,reason,devId);
+// reason="中继器故障";
+// serverHandler.equipmentService.updateExstate(state,reason,devId);
} else if (fqbm.equals("5")) {
alarm.setWaringType("系统故障");
alarm.setContent("打印机缺纸");
- reason="打印机缺纸";
- serverHandler.equipmentService.updateExstate(state,reason,devId);
+// reason="打印机缺纸";
+// serverHandler.equipmentService.updateExstate(state,reason,devId);
} else if (fqbm.equals("6")) {
alarm.setWaringType("系统故障");
alarm.setContent("打印机故障");
- reason="打印机故障";
- serverHandler.equipmentService.updateExstate(state,reason,devId);
+// reason="打印机故障";
+// serverHandler.equipmentService.updateExstate(state,reason,devId);
} else if (fqbm.equals("7")) {
alarm.setWaringType("系统故障");
alarm.setContent("扩展模块无直流");
- reason="扩展模块无直流";
- serverHandler.equipmentService.updateExstate(state,reason,devId);
+// reason="扩展模块无直流";
+// serverHandler.equipmentService.updateExstate(state,reason,devId);
} else if (fqbm.equals("8")) {
alarm.setWaringType("系统故障");
alarm.setContent("扩展模块低电压");
@@ -487,16 +487,16 @@
} else if (fqbm.equals("9")) {
alarm.setWaringType("系统故障");
alarm.setContent("扩展模块复位");
- reason="扩展模块复位";
- serverHandler.equipmentService.updateExstate(state,reason,devId);
+// reason="扩展模块复位";
+// serverHandler.equipmentService.updateExstate(state,reason,devId);
}
break;
case "34":
if (fqbm.equals("1")) {
alarm.setWaringType("系统故障");
alarm.setContent("扩展模块防拆触发");
- reason="扩展模块防拆触发";
- serverHandler.equipmentService.updateExstate(state,reason,devId);
+// reason="扩展模块防拆触发";
+// serverHandler.equipmentService.updateExstate(state,reason,devId);
}
break;
case "35":
@@ -513,8 +513,8 @@
} else if (fqbm.equals("2")) {
alarm.setWaringType("系统故障");
alarm.setContent("电话接口2故障");
- reason="电话接口2故障";
- serverHandler.equipmentService.updateExstate(state,reason,devId);
+// reason="电话接口2故障";
+// serverHandler.equipmentService.updateExstate(state,reason,devId);
} else if (fqbm.equals("3")) {
alarm.setWaringType("通讯故障");
alarm.setContent("远距离无线通讯");
@@ -1354,10 +1354,14 @@
if (fqbm.equals("0")) {
alarm.setWaringType("系统故障-恢复");
alarm.setContent("电话线故障-通讯故障（转发）");
+ reason="";
+ serverHandler.equipmentService.updateExstate("",reason,devId);
}
else if (fqbm.equals("1")) {
alarm.setWaringType("系统故障");
alarm.setContent("交流电故障-通讯故障（转发）");
+ reason="";
+ serverHandler.equipmentService.updateExstate("",reason,devId);
}
else if (fqbm.equals("2")) {
alarm.setWaringType("系统故障");
@@ -1366,6 +1370,7 @@
else if (fqbm.equals("3")) {
alarm.setWaringType("系统故障");
alarm.setContent("警号/继电器故障-通讯故障（转发）");
+
}
else if (fqbm.equals("4")) {
alarm.setWaringType("系统故障");
@@ -1382,6 +1387,8 @@
else if (fqbm.equals("7")) {
alarm.setWaringType("系统故障-恢复");
alarm.setContent("交流电故障恢复-通讯故障（转发）");
+ reason="";
+ serverHandler.equipmentService.updateExstate("",reason,devId);
}
else if (fqbm.equals("8")) {
alarm.setWaringType("系统故障-恢复");
@@ -1394,14 +1401,20 @@
else if (fqbm.equals("A")) {
alarm.setWaringType("系统故障-恢复");
alarm.setContent("电话线故障-通讯故障（转发）");
+ reason="";
+ serverHandler.equipmentService.updateExstate("",reason,devId);
}
else if (fqbm.equals("B")) {
alarm.setWaringType("系统故障-恢复");
alarm.setContent("回路短路故障恢复-通讯故障（转发）");
+ reason="";
+ serverHandler.equipmentService.updateExstate("",reason,devId);
}
else if (fqbm.equals("C")) {
alarm.setWaringType("系统故障-恢复");
alarm.setContent("无线监控恢复-通讯故障（转发）");
+ reason="";
+ serverHandler.equipmentService.updateExstate("",reason,devId);
}
else if (fqbm.equals("E")) {
alarm.setWaringType("系统故障");
@@ -1410,6 +1423,8 @@
else if (fqbm.equals("F")) {
alarm.setWaringType("系统故障-恢复");
alarm.setContent("无线监控故障恢复-通讯故障（转发）");
+ reason="";
+ serverHandler.equipmentService.updateExstate("",reason,devId);
}
break;
case "9B":
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 4a81952..9a1af8c 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
@@ -40,6 +40,8 @@
import springfox.documentation.annotations.ApiIgnore;
import javax.validation.Valid;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.List;
import java.util.Map;
@@ -86,9 +88,29 @@
@ApiOperationSupport(order = 2)
@ApiOperation(value = "分页", notes = "传入tenant")
//@PreAuth(RoleConstant.HAS_ROLE_ADMIN)
- public R<IPage<Tenant>> list(@ApiIgnore @RequestParam Map<String, Object> tenant, Query query, BladeUser bladeUser) {
+ 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);
}
@@ -112,8 +134,33 @@
@ApiOperationSupport(order = 4)
@ApiOperation(value = "分页", notes = "传入tenant")
//@PreAuth(RoleConstant.HAS_ROLE_ADMIN)
- public R<IPage<Tenant>> page(Tenant tenant, Query query) {
+ 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 3c94fc1..c7ad73a 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,11 +21,34 @@
<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>
--
Gitblit v1.9.3