Merge remote-tracking branch 'origin/ext-dev' into ext-dev

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/AndonQueryUserModel.java

@@ -0,0 +1,27 @@
+package cn.estsh.i3plus.pojo.model.platform;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @author ns
+ * @create 2022/5/17 0017 下午 15:38
+ * andon 查询用户信息model
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@ApiModel("andon 调用core查询的model")
+public class AndonQueryUserModel {
+    @ApiModelProperty(value ="工厂代码" , access ="工厂代码")
+    private  String organizeCode;
+    @ApiModelProperty(value ="账号登录名" , access ="账号登录名")
+    private  String userLoginName;
+    @ApiModelProperty(value ="用户名称" , access ="用户名称")
+    private String  userName;
+    @ApiModelProperty(value ="部门名称" , access ="部门名称")
+    private String  department;
+}

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/AndonQueryUserResultModel.java

@@ -0,0 +1,29 @@
+package cn.estsh.i3plus.pojo.model.platform;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @author ns
+ * @create 2022/5/17 0017 下午 15:39
+ * 松下andon 查询结果返回model
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@ApiModel("根据条件查询数据返回给andon的结果")
+public class AndonQueryUserResultModel {
+    @ApiModelProperty(value ="用户账号id" , access ="用户账号id")
+    private Long userId;
+    @ApiModelProperty(value ="用户信息id" , access ="用户信息id")
+    private Long userInfoId;
+    @ApiModelProperty(value ="账号登录名" , access ="账号登录名")
+    private  String loginName;
+    @ApiModelProperty(value ="用户名称" , access ="用户名称")
+    private String  userName;
+    @ApiModelProperty(value ="部门名称" , access ="部门名称")
+    private String  department;
+}

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/DingSendBatchRequestModel.java

@@ -19,7 +19,9 @@ import java.util.List;
 public class DingSendBatchRequestModel {
 
     @ApiModelProperty(value ="手机号" , access ="手机号")
-   private  List<String> phoneNumberList ;
+   private  List<String> phoneNumberList;
+    @ApiModelProperty(value ="账号登录名列表" , access ="账号登录名列表")
+    private  List<String> userLoginNameList ;
     @ApiModelProperty(value ="消息标题" , access ="消息标题")
     private String title ;
     @ApiModelProperty(value ="消息内容" , access ="消息内容")