yin_yu820 1 anno fa
parent
commit
23d4f3aef5
26 ha cambiato i file con 31 aggiunte e 17 eliminazioni
  1. 2 0
      jp-console/jeeplus-platform/jeeplus-admin/src/main/java/com/jeeplus/sys/mapper/xml/UserMapper.xml
  2. BIN
      jp-console/jeeplus-platform/jeeplus-admin/target/classes/com/jeeplus/security/config/WebSecurityConfig.class
  3. BIN
      jp-console/jeeplus-platform/jeeplus-admin/target/classes/com/jeeplus/sys/controller/LoginController.class
  4. BIN
      jp-console/jeeplus-platform/jeeplus-admin/target/classes/com/jeeplus/sys/controller/UserController.class
  5. BIN
      jp-console/jeeplus-platform/jeeplus-admin/target/classes/com/jeeplus/sys/domain/User.class
  6. BIN
      jp-console/jeeplus-platform/jeeplus-admin/target/classes/com/jeeplus/sys/mapper/UserMapper.class
  7. 10 0
      jp-console/jeeplus-platform/jeeplus-admin/target/classes/com/jeeplus/sys/mapper/xml/UserMapper.xml
  8. BIN
      jp-console/jeeplus-platform/jeeplus-admin/target/classes/com/jeeplus/sys/service/UserService.class
  9. BIN
      jp-console/jeeplus-platform/jeeplus-admin/target/classes/com/jeeplus/sys/service/dto/UserDTO.class
  10. BIN
      jp-console/jeeplus-platform/jeeplus-admin/target/classes/com/jeeplus/sys/service/mapstruct/UserWrapperImpl.class
  11. 1 1
      jp-console/jeeplus-platform/jeeplus-admin/target/generated-sources/annotations/com/jeeplus/sys/service/mapstruct/AreaWrapperImpl.java
  12. 1 1
      jp-console/jeeplus-platform/jeeplus-admin/target/generated-sources/annotations/com/jeeplus/sys/service/mapstruct/DataRuleWrapperImpl.java
  13. 1 1
      jp-console/jeeplus-platform/jeeplus-admin/target/generated-sources/annotations/com/jeeplus/sys/service/mapstruct/DeskWrapperImpl.java
  14. 1 1
      jp-console/jeeplus-platform/jeeplus-admin/target/generated-sources/annotations/com/jeeplus/sys/service/mapstruct/DictTypeWrapperImpl.java
  15. 1 1
      jp-console/jeeplus-platform/jeeplus-admin/target/generated-sources/annotations/com/jeeplus/sys/service/mapstruct/DictValueWrapperImpl.java
  16. 1 1
      jp-console/jeeplus-platform/jeeplus-admin/target/generated-sources/annotations/com/jeeplus/sys/service/mapstruct/LanguageWrapperImpl.java
  17. 1 1
      jp-console/jeeplus-platform/jeeplus-admin/target/generated-sources/annotations/com/jeeplus/sys/service/mapstruct/LogWrapperImpl.java
  18. 1 1
      jp-console/jeeplus-platform/jeeplus-admin/target/generated-sources/annotations/com/jeeplus/sys/service/mapstruct/MenuWrapperImpl.java
  19. 1 1
      jp-console/jeeplus-platform/jeeplus-admin/target/generated-sources/annotations/com/jeeplus/sys/service/mapstruct/OfficeWrapperImpl.java
  20. 1 1
      jp-console/jeeplus-platform/jeeplus-admin/target/generated-sources/annotations/com/jeeplus/sys/service/mapstruct/PostWrapperImpl.java
  21. 1 1
      jp-console/jeeplus-platform/jeeplus-admin/target/generated-sources/annotations/com/jeeplus/sys/service/mapstruct/RoleWrapperImpl.java
  22. 1 1
      jp-console/jeeplus-platform/jeeplus-admin/target/generated-sources/annotations/com/jeeplus/sys/service/mapstruct/SysConfigWrapperImpl.java
  23. 1 1
      jp-console/jeeplus-platform/jeeplus-admin/target/generated-sources/annotations/com/jeeplus/sys/service/mapstruct/TenantWrapperImpl.java
  24. 3 1
      jp-console/jeeplus-platform/jeeplus-admin/target/generated-sources/annotations/com/jeeplus/sys/service/mapstruct/UserWrapperImpl.java
  25. 3 3
      jp-console/jeeplus-platform/jeeplus-common/src/main/java/com/jeeplus/aop/demo/DemoAspect.java
  26. BIN
      jp-console/jeeplus-platform/jeeplus-common/target/classes/com/jeeplus/aop/demo/DemoAspect.class

+ 2 - 0
jp-console/jeeplus-platform/jeeplus-admin/src/main/java/com/jeeplus/sys/mapper/xml/UserMapper.xml

@@ -13,6 +13,7 @@
         <result property="mobile" column="mobile"/>
         <result property="photo" column="photo"/>
         <result property="sign" column="sign"/>
+        <result property="signPic" column="signPic"/>
         <result property="remarks" column="remarks"/>
         <result property="loginFlag" column="login_flag"/>
         <result property="loginIp" column="loginIp"/>
@@ -57,6 +58,7 @@
 		a.photo,
 		a.qr_code,
 		a.sign,
+        a.sign_pic AS "signPic",
 		a.create_by_id AS "createBy.id",
 		a.create_time,
 		a.update_by_id AS "updateBy.id",

BIN
jp-console/jeeplus-platform/jeeplus-admin/target/classes/com/jeeplus/security/config/WebSecurityConfig.class


BIN
jp-console/jeeplus-platform/jeeplus-admin/target/classes/com/jeeplus/sys/controller/LoginController.class


BIN
jp-console/jeeplus-platform/jeeplus-admin/target/classes/com/jeeplus/sys/controller/UserController.class


BIN
jp-console/jeeplus-platform/jeeplus-admin/target/classes/com/jeeplus/sys/domain/User.class


BIN
jp-console/jeeplus-platform/jeeplus-admin/target/classes/com/jeeplus/sys/mapper/UserMapper.class


+ 10 - 0
jp-console/jeeplus-platform/jeeplus-admin/target/classes/com/jeeplus/sys/mapper/xml/UserMapper.xml

@@ -13,6 +13,7 @@
         <result property="mobile" column="mobile"/>
         <result property="photo" column="photo"/>
         <result property="sign" column="sign"/>
+        <result property="signPic" column="signPic"/>
         <result property="remarks" column="remarks"/>
         <result property="loginFlag" column="login_flag"/>
         <result property="loginIp" column="loginIp"/>
@@ -57,6 +58,7 @@
 		a.photo,
 		a.qr_code,
 		a.sign,
+        a.sign_pic AS "signPic",
 		a.create_by_id AS "createBy.id",
 		a.create_time,
 		a.update_by_id AS "updateBy.id",
@@ -160,4 +162,12 @@
         INSERT INTO sys_user_post(user_id, post_id)
         VALUES (#{userId}, #{postId})
     </insert>
+<!--    获取科室用户列表-->
+    <select id="findOfficeList" resultMap="userResult">
+        SELECT
+        <include refid="userColumns"/>
+        FROM sys_user a
+        <include refid="userJoins"/>
+        ${ew.customSqlSegment}
+    </select>
 </mapper>

BIN
jp-console/jeeplus-platform/jeeplus-admin/target/classes/com/jeeplus/sys/service/UserService.class


BIN
jp-console/jeeplus-platform/jeeplus-admin/target/classes/com/jeeplus/sys/service/dto/UserDTO.class


BIN
jp-console/jeeplus-platform/jeeplus-admin/target/classes/com/jeeplus/sys/service/mapstruct/UserWrapperImpl.class


+ 1 - 1
jp-console/jeeplus-platform/jeeplus-admin/target/generated-sources/annotations/com/jeeplus/sys/service/mapstruct/AreaWrapperImpl.java

@@ -14,7 +14,7 @@ import org.springframework.stereotype.Component;
 
 @Generated(
     value = "org.mapstruct.ap.MappingProcessor",
-    date = "2024-03-20T09:32:48+0800",
+    date = "2024-03-29T09:40:36+0800",
     comments = "version: 1.4.1.Final, compiler: javac, environment: Java 11.0.13 (JetBrains s.r.o.)"
 )
 @Component

+ 1 - 1
jp-console/jeeplus-platform/jeeplus-admin/target/generated-sources/annotations/com/jeeplus/sys/service/mapstruct/DataRuleWrapperImpl.java

@@ -13,7 +13,7 @@ import org.springframework.stereotype.Component;
 
 @Generated(
     value = "org.mapstruct.ap.MappingProcessor",
-    date = "2024-03-20T09:32:49+0800",
+    date = "2024-03-29T09:40:36+0800",
     comments = "version: 1.4.1.Final, compiler: javac, environment: Java 11.0.13 (JetBrains s.r.o.)"
 )
 @Component

+ 1 - 1
jp-console/jeeplus-platform/jeeplus-admin/target/generated-sources/annotations/com/jeeplus/sys/service/mapstruct/DeskWrapperImpl.java

@@ -13,7 +13,7 @@ import org.springframework.stereotype.Component;
 
 @Generated(
     value = "org.mapstruct.ap.MappingProcessor",
-    date = "2024-03-20T09:32:48+0800",
+    date = "2024-03-29T09:40:35+0800",
     comments = "version: 1.4.1.Final, compiler: javac, environment: Java 11.0.13 (JetBrains s.r.o.)"
 )
 @Component

+ 1 - 1
jp-console/jeeplus-platform/jeeplus-admin/target/generated-sources/annotations/com/jeeplus/sys/service/mapstruct/DictTypeWrapperImpl.java

@@ -13,7 +13,7 @@ import org.springframework.stereotype.Component;
 
 @Generated(
     value = "org.mapstruct.ap.MappingProcessor",
-    date = "2024-03-20T09:32:49+0800",
+    date = "2024-03-29T09:40:36+0800",
     comments = "version: 1.4.1.Final, compiler: javac, environment: Java 11.0.13 (JetBrains s.r.o.)"
 )
 @Component

+ 1 - 1
jp-console/jeeplus-platform/jeeplus-admin/target/generated-sources/annotations/com/jeeplus/sys/service/mapstruct/DictValueWrapperImpl.java

@@ -14,7 +14,7 @@ import org.springframework.stereotype.Component;
 
 @Generated(
     value = "org.mapstruct.ap.MappingProcessor",
-    date = "2024-03-20T09:32:48+0800",
+    date = "2024-03-29T09:40:36+0800",
     comments = "version: 1.4.1.Final, compiler: javac, environment: Java 11.0.13 (JetBrains s.r.o.)"
 )
 @Component

+ 1 - 1
jp-console/jeeplus-platform/jeeplus-admin/target/generated-sources/annotations/com/jeeplus/sys/service/mapstruct/LanguageWrapperImpl.java

@@ -13,7 +13,7 @@ import org.springframework.stereotype.Component;
 
 @Generated(
     value = "org.mapstruct.ap.MappingProcessor",
-    date = "2024-03-20T09:32:48+0800",
+    date = "2024-03-29T09:40:36+0800",
     comments = "version: 1.4.1.Final, compiler: javac, environment: Java 11.0.13 (JetBrains s.r.o.)"
 )
 @Component

+ 1 - 1
jp-console/jeeplus-platform/jeeplus-admin/target/generated-sources/annotations/com/jeeplus/sys/service/mapstruct/LogWrapperImpl.java

@@ -13,7 +13,7 @@ import org.springframework.stereotype.Component;
 
 @Generated(
     value = "org.mapstruct.ap.MappingProcessor",
-    date = "2024-03-20T09:32:49+0800",
+    date = "2024-03-29T09:40:36+0800",
     comments = "version: 1.4.1.Final, compiler: javac, environment: Java 11.0.13 (JetBrains s.r.o.)"
 )
 @Component

+ 1 - 1
jp-console/jeeplus-platform/jeeplus-admin/target/generated-sources/annotations/com/jeeplus/sys/service/mapstruct/MenuWrapperImpl.java

@@ -17,7 +17,7 @@ import org.springframework.stereotype.Component;
 
 @Generated(
     value = "org.mapstruct.ap.MappingProcessor",
-    date = "2024-03-20T09:32:48+0800",
+    date = "2024-03-29T09:40:36+0800",
     comments = "version: 1.4.1.Final, compiler: javac, environment: Java 11.0.13 (JetBrains s.r.o.)"
 )
 @Component

+ 1 - 1
jp-console/jeeplus-platform/jeeplus-admin/target/generated-sources/annotations/com/jeeplus/sys/service/mapstruct/OfficeWrapperImpl.java

@@ -14,7 +14,7 @@ import org.springframework.stereotype.Component;
 
 @Generated(
     value = "org.mapstruct.ap.MappingProcessor",
-    date = "2024-03-20T09:32:48+0800",
+    date = "2024-03-29T09:40:36+0800",
     comments = "version: 1.4.1.Final, compiler: javac, environment: Java 11.0.13 (JetBrains s.r.o.)"
 )
 @Component

+ 1 - 1
jp-console/jeeplus-platform/jeeplus-admin/target/generated-sources/annotations/com/jeeplus/sys/service/mapstruct/PostWrapperImpl.java

@@ -13,7 +13,7 @@ import org.springframework.stereotype.Component;
 
 @Generated(
     value = "org.mapstruct.ap.MappingProcessor",
-    date = "2024-03-20T09:32:49+0800",
+    date = "2024-03-29T09:40:36+0800",
     comments = "version: 1.4.1.Final, compiler: javac, environment: Java 11.0.13 (JetBrains s.r.o.)"
 )
 @Component

+ 1 - 1
jp-console/jeeplus-platform/jeeplus-admin/target/generated-sources/annotations/com/jeeplus/sys/service/mapstruct/RoleWrapperImpl.java

@@ -13,7 +13,7 @@ import org.springframework.stereotype.Component;
 
 @Generated(
     value = "org.mapstruct.ap.MappingProcessor",
-    date = "2024-03-20T09:32:48+0800",
+    date = "2024-03-29T09:40:36+0800",
     comments = "version: 1.4.1.Final, compiler: javac, environment: Java 11.0.13 (JetBrains s.r.o.)"
 )
 @Component

+ 1 - 1
jp-console/jeeplus-platform/jeeplus-admin/target/generated-sources/annotations/com/jeeplus/sys/service/mapstruct/SysConfigWrapperImpl.java

@@ -14,7 +14,7 @@ import org.springframework.stereotype.Component;
 
 @Generated(
     value = "org.mapstruct.ap.MappingProcessor",
-    date = "2024-03-20T09:32:49+0800",
+    date = "2024-03-29T09:40:36+0800",
     comments = "version: 1.4.1.Final, compiler: javac, environment: Java 11.0.13 (JetBrains s.r.o.)"
 )
 @Component

+ 1 - 1
jp-console/jeeplus-platform/jeeplus-admin/target/generated-sources/annotations/com/jeeplus/sys/service/mapstruct/TenantWrapperImpl.java

@@ -12,7 +12,7 @@ import org.springframework.stereotype.Component;
 
 @Generated(
     value = "org.mapstruct.ap.MappingProcessor",
-    date = "2024-03-20T09:32:49+0800",
+    date = "2024-03-29T09:40:36+0800",
     comments = "version: 1.4.1.Final, compiler: javac, environment: Java 11.0.13 (JetBrains s.r.o.)"
 )
 @Component

+ 3 - 1
jp-console/jeeplus-platform/jeeplus-admin/target/generated-sources/annotations/com/jeeplus/sys/service/mapstruct/UserWrapperImpl.java

@@ -13,7 +13,7 @@ import org.springframework.stereotype.Component;
 
 @Generated(
     value = "org.mapstruct.ap.MappingProcessor",
-    date = "2024-03-20T09:32:48+0800",
+    date = "2024-03-29T09:40:36+0800",
     comments = "version: 1.4.1.Final, compiler: javac, environment: Java 11.0.13 (JetBrains s.r.o.)"
 )
 @Component
@@ -130,6 +130,7 @@ public class UserWrapperImpl implements UserWrapper {
         user.setQrCode( dto.getQrCode() );
         user.setSign( dto.getSign() );
         user.setRemarks( dto.getRemarks() );
+        user.setSignPic( dto.getSignPic() );
 
         return user;
     }
@@ -164,6 +165,7 @@ public class UserWrapperImpl implements UserWrapper {
         userDTO.setPhoto( entity.getPhoto() );
         userDTO.setQrCode( entity.getQrCode() );
         userDTO.setSign( entity.getSign() );
+        userDTO.setSignPic( entity.getSignPic() );
         userDTO.setRemarks( entity.getRemarks() );
 
         return userDTO;

+ 3 - 3
jp-console/jeeplus-platform/jeeplus-common/src/main/java/com/jeeplus/aop/demo/DemoAspect.java

@@ -69,9 +69,9 @@ public class DemoAspect {
         Method method = signature.getMethod ( );
 
         // 演示模式
-        if ( this.demoMode && method.getAnnotation ( DemoMode.class ) != null ) {
-            throw new DemoException ( "演示模式,禁止此操作!" );
-        }
+//        if ( this.demoMode && method.getAnnotation ( DemoMode.class ) != null ) {
+//            throw new DemoException ( "演示模式,禁止此操作!" );
+//        }
 
 
     }

BIN
jp-console/jeeplus-platform/jeeplus-common/target/classes/com/jeeplus/aop/demo/DemoAspect.class