Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into Mytest

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;

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java

@@ -100,16 +100,15 @@ public class CommonEnumUtil {
          * EAM_PAD
          */
         EAM_PAD(109, 8500, 28, 211000000L, "eam-pad", "设备信息管理服务pad"),
-
         /**
-         * 能源管理系统
+         * SWEB调用
          */
-        EMS(37, 8450, 31, 170000000L, "i3ems", "能源管理系统 "),
+        SWEB_VENDOR(666,8810,0,0,"sweb-vendor","供应商客户端服务"),
 
         /**
-         * SWEB调用
+         * EMS调用
          */
-        SWEB_VENDOR(666,8810,0,0,"sweb-vendor","供应商客户端服务");
+        EMS(37,8380,31,170000000L,"i3ems","能源管理系统");
 
         /**
          * 产品ID

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";
 
 }

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 = "用户消息不存在";
         }