From df46e6498d9ce92f0b3f249a592d43bc773532eb Mon Sep 17 00:00:00 2001 From: "zhang.xw" Date: Fri, 19 Aug 2022 09:12:19 +0800 Subject: [PATCH 1/5] =?UTF-8?q?ems=E6=96=B0=E5=A2=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java index 7263ba4..95b173e 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java @@ -104,7 +104,12 @@ public class CommonEnumUtil { /** * SWEB调用 */ - SWEB_VENDOR(666,8810,0,0,"sweb-vendor","供应商客户端服务"); + SWEB_VENDOR(666,8810,0,0,"sweb-vendor","供应商客户端服务"), + + /** + * EMS调用 + */ + EMS(201,8380,0,170000000L,"i3ems","能源管理系统"); /** * 产品ID From effde55cf9bff0a4b2abd72c0cd8c6afb708ac8e Mon Sep 17 00:00:00 2001 From: "zhang.xw" Date: Fri, 19 Aug 2022 15:14:24 +0800 Subject: [PATCH 2/5] =?UTF-8?q?ems=E6=96=B0=E5=A2=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java index 3ff3798..c2c8157 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java @@ -100,12 +100,6 @@ public class CommonEnumUtil { * EAM_PAD */ EAM_PAD(109, 8500, 28, 211000000L, "eam-pad", "设备信息管理服务pad"), - - /** - * 能源管理系统 - */ - EMS(37, 8450, 31, 170000000L, "i3ems", "能源管理系统 "), - /** * SWEB调用 */ @@ -114,7 +108,7 @@ public class CommonEnumUtil { /** * EMS调用 */ - EMS(201,8380,0,170000000L,"i3ems","能源管理系统"); + EMS(37,8380,31,170000000L,"i3ems","能源管理系统"); /** * 产品ID From 875447706ea1c0a5f64b97655de508ea4495f9b6 Mon Sep 17 00:00:00 2001 From: "feng.liu" <123456> Date: Wed, 24 Aug 2022 13:42:26 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E7=94=A8=E6=88=B7=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E5=AF=BC=E5=87=BA=E5=A2=9E=E5=8A=A0=20=E6=9C=80=E5=90=8E?= =?UTF-8?q?=E4=B8=80=E6=AC=A1=E7=99=BB=E5=BD=95=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/model/platform/UserExportModel.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/UserExportModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/UserExportModel.java index 527391a..d7aa15a 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/UserExportModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/UserExportModel.java @@ -123,6 +123,9 @@ public class UserExportModel extends BaseBean { @AnnoOutputColumn(refClass = CommonEnumUtil.USER_STATUS.class) private Integer userStatus; + @ApiModelProperty(value ="用户最后登录时间") + private String userLoginLastDateTime; + public UserExportModel() { } @@ -175,6 +178,7 @@ public class UserExportModel extends BaseBean { this.createUser=sysUserInfo.getCreateUser(); this.modifyDatetime=sysUserInfo.getModifyDatetime(); this.modifyUser=sysUserInfo.getModifyUser(); + this.userLoginLastDateTime = sysUserInfo.getUserLoginLastDateTime(); } else { this.infoName = "用户消息不存在"; } From e6b8601631f26c7147da96567e498d8ecec21c7d Mon Sep 17 00:00:00 2001 From: "zhang.xw" Date: Mon, 29 Aug 2022 15:43:50 +0800 Subject: [PATCH 4/5] =?UTF-8?q?xstream=20=E5=85=BC=E5=AE=B91.4.9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/base/common/XStreamFactory.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/common/XStreamFactory.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/common/XStreamFactory.java index a5c3a42..1f44d73 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/common/XStreamFactory.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/common/XStreamFactory.java @@ -11,6 +11,7 @@ import com.thoughtworks.xstream.io.naming.NameCoder; import com.thoughtworks.xstream.io.naming.NoNameCoder; import com.thoughtworks.xstream.io.xml.PrettyPrintWriter; import com.thoughtworks.xstream.io.xml.XppDomDriver; +import com.thoughtworks.xstream.security.AnyTypePermission; import lombok.Data; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -82,6 +83,7 @@ public class XStreamFactory { // xStream.setMode(XStream.NO_REFERENCES); xStream.autodetectAnnotations(true); + xStream.addPermission(AnyTypePermission.ANY); // XStream.setupDefaultSecurity(xStream); return xStream; From 4f6f6878fe651781a050f2bc69d47d375267b789 Mon Sep 17 00:00:00 2001 From: "zhang.xw" Date: Mon, 12 Sep 2022 20:14:27 +0800 Subject: [PATCH 5/5] =?UTF-8?q?ems=20=E5=BC=82=E5=B8=B8=E9=80=9A=E7=9F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/model/platform/DingSendBatchRequestModel.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/DingSendBatchRequestModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/DingSendBatchRequestModel.java index 55de6ed..2749382 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/DingSendBatchRequestModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/DingSendBatchRequestModel.java @@ -26,5 +26,7 @@ public class DingSendBatchRequestModel { private String title ; @ApiModelProperty(value ="消息内容" , access ="消息内容") private String content; + @ApiModelProperty(value ="项目类型(默认andon)" , access ="项目类型(默认andon)") + private String softType = "andon"; }