Merge remote-tracking branch 'origin/master'

pom.xml

@@ -157,38 +157,30 @@
             <version>1.1</version>
         </dependency>
 
-
-        <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-lang3</artifactId>
-        </dependency>
-
-        <!--钉钉-->
-        <dependency>
-            <groupId>com.aliyun</groupId>
-            <artifactId>alibaba-dingtalk-service-sdk</artifactId>
-            <version>2.0.0</version>
-        </dependency>
-
-<!--                &lt;!&ndash; mybatis-plus-generator 代码生成器依赖&ndash;&gt;-->
-<!--                <dependency>-->
-<!--                    <groupId>com.baomidou</groupId>-->
-<!--                    <artifactId>mybatis-plus-generator</artifactId>-->
-<!--                    <version>3.3.1.tmp</version>-->
-<!--                </dependency>-->
-<!--                &lt;!&ndash;  freemarker依赖&ndash;&gt;-->
-<!--                <dependency>-->
-<!--                    <groupId>org.freemarker</groupId>-->
-<!--                    <artifactId>freemarker</artifactId>-->
-<!--                </dependency>-->
-
-
         <dependency>
             <groupId>org.redisson</groupId>
             <artifactId>redisson</artifactId>
             <version>3.14.1</version>
         </dependency>
 
+        <!-- 阿里云对象存储 -->
+        <dependency>
+            <groupId>com.aliyun.oss</groupId>
+            <artifactId>aliyun-sdk-oss</artifactId>
+            <version>3.17.4</version>
+        </dependency>
+
+        <!-- 阿里云人脸识别 -->
+        <dependency>
+            <groupId>com.aliyun</groupId>
+            <artifactId>aliyun-java-sdk-core</artifactId>
+            <version>4.6.1</version>
+        </dependency>
+        <dependency>
+            <groupId>com.aliyun</groupId>
+            <artifactId>aliyun-java-sdk-facebody</artifactId>
+            <version>2.0.12</version>
+        </dependency>
     </dependencies>
 
     <build>

src/main/java/com/ycwl/basic/model/pc/adminUser/req/AddOrUpdateAdminUserReqVO.java

@@ -16,4 +16,8 @@ public class AddOrUpdateAdminUserReqVO {
     private String account;
     @ApiModelProperty(value = "密码")
     private String password;
+    @ApiModelProperty(value = "名称")
+    private String name;
+    @ApiModelProperty(value = "手机号")
+    private String phone;
 }

src/main/java/com/ycwl/basic/model/pc/adminUser/req/AdminUserListReqVO.java

@@ -11,13 +11,9 @@ public class AdminUserListReqVO extends BaseQueryParameterReq {
     @ApiModelProperty(value = "姓名")
     private String name;
     @ApiModelProperty(value = "账号")
+    private String account;
+    @ApiModelProperty(value = "手机号")
     private String phone;
-    @ApiModelProperty(value = "工号")
-    private String jobNo;
-    @ApiModelProperty(value = "组织ID")
-    private String companyId;
-    //@ApiModelProperty(value = "部门ID")
-    //private String departmentId;
     @ApiModelProperty(value = "角色ID")
     private String roleId;
 }

src/main/java/com/ycwl/basic/model/pc/adminUser/resp/AdminUserListRespVO.java

@@ -4,27 +4,25 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.Date;
+
 @Data
 @ApiModel(value = "后台管理人员返回列表VO")
 public class AdminUserListRespVO {
     @ApiModelProperty(value = "id")
     private String id;
+    @ApiModelProperty(value = "账号")
+    private String account;
     @ApiModelProperty(value = "昵称")
     private String name;
-//    @ApiModelProperty(value = "员工ID")
-//    private String staffId;
-//    @ApiModelProperty(value = "员工姓名")
-//    private String staffName;
     @ApiModelProperty(value = "手机号")
     private String phone;
-//    @ApiModelProperty(value = "工号")
-//    private String jobNo;
-//    @ApiModelProperty(value = "组织")
-//    private String companyName;
-//    @ApiModelProperty(value = "组织ID")
-//    private String companyId;
     @ApiModelProperty(value = "角色")
     private String roleName;
     @ApiModelProperty(value = "角色ID")
     private String roleId;
+    @ApiModelProperty(value = "状态")
+    private Integer status;
+    @ApiModelProperty(value = "创建时间")
+    private Date createTime;
 }

src/main/java/com/ycwl/basic/model/pc/renderWorker/entity/RenderWorkerEntity.java

@@ -28,7 +28,7 @@ public class RenderWorkerEntity {
     /**
      * 运行环境
      */
-    private String runTimeVersion;
+    private String runtimeVersion;
     /**
      * 版本
      */

src/main/java/com/ycwl/basic/model/pc/renderWorker/req/RenderWorkerReqQuery.java

@@ -34,7 +34,7 @@ public class RenderWorkerReqQuery extends BaseQueryParameterReq {
      * 运行环境
      */
     @ApiModelProperty("运行环境")
-    private String runTimeVersion;
+    private String runtimeVersion;
     /**
      * 版本
      */

src/main/java/com/ycwl/basic/model/pc/renderWorker/resp/RenderWorkerRespVO.java

@@ -31,7 +31,7 @@ public class RenderWorkerRespVO {
      * 运行环境
      */
     @ApiModelProperty("运行环境")
-    private String runTimeVersion;
+    private String runtimeVersion;
     /**
      * 版本
      */

src/main/java/com/ycwl/basic/model/pc/role/req/RoleListReqVO.java

@@ -10,6 +10,4 @@ import lombok.Data;
 public class RoleListReqVO extends BaseQueryParameterReq {
     @ApiModelProperty(value = "名字")
     private String name;
-//    @ApiModelProperty(value = "0系统角色 1业务角色")
-//    private Integer type;
 }

src/main/resources/mapper/pc/AdminUserMapper.xml

@@ -27,7 +27,7 @@
 
     <update id="update" parameterType="com.ycwl.basic.model.pc.adminUser.req.AddOrUpdateAdminUserReqVO">
         update admin_user
-        set `role_id`  =#{roleId}
+        set `role_id`  =#{roleId}, `account`=#{account}, `name`=#{name}, `phone`=#{phone}
         where id = #{id}
     </update>
     <update id="updatePassword">
@@ -44,6 +44,9 @@
         au.id,
         au.phone,
         au.name,
+        au.account,
+        au.create_time,
+        au.status,
         r.id as roleId,
         r.name as roleName
         from admin_user au,
@@ -54,6 +57,10 @@
             and
             locate(#{name},au.`name`) > 0
         </if>
+        <if test="account!=null and account!=''">
+            and
+            locate(#{account},au.`account`) > 0
+        </if>
         <if test="phone!=null and phone!=''">
             and
             locate(#{phone},au.`phone`) > 0