机构模块调整

src/main/java/com/rf/psychological/PsychologicalApplication.java

@@ -1,20 +1,14 @@
 package com.rf.psychological;
 
 import com.querydsl.jpa.impl.JPAQueryFactory;
-import com.rf.psychological.config.SystemExcludeFilter;
 import lombok.extern.slf4j.Slf4j;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.cache.annotation.EnableCaching;
 import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.ComponentScan;
-import org.springframework.context.annotation.FilterType;
-import org.springframework.context.annotation.Profile;
 import org.springframework.core.env.Environment;
 import org.springframework.data.jpa.repository.config.EnableJpaAuditing;
 import org.springframework.data.jpa.repository.config.EnableJpaRepositories;

src/main/java/com/rf/psychological/config/SystemExcludeFilter.java

@@ -1,25 +0,0 @@
-package com.rf.psychological.config;
-
-import com.rf.psychological.utils.Constant;
-import org.springframework.core.type.ClassMetadata;
-import org.springframework.core.type.classreading.MetadataReader;
-import org.springframework.core.type.classreading.MetadataReaderFactory;
-import org.springframework.core.type.filter.TypeFilter;
-
-/**
- * @Author:zzf
- * @Date:2022/7/24:11:36
- * @Description:
- */
-@Deprecated
-//@Profile("lan")
-public class SystemExcludeFilter implements TypeFilter {
-
-    @Override
-    public boolean match(MetadataReader metadataReader, MetadataReaderFactory metadataReaderFactory) {
-        ClassMetadata classMetadata = metadataReader.getClassMetadata();
-        String name = classMetadata.getClassName();
-        System.out.println("package-"+name);
-        return name.contains(Constant.EXCLUDE_PACKAGE_NAME);
-    }
-}

src/main/java/com/rf/psychological/dao/vo/SaveInstitutionVO.java

@@ -20,18 +20,10 @@ public class SaveInstitutionVO {
 
     private String loginName;
 
-    private String superAdminPassword;
-
-    private Boolean addAdminFlag;
-
-    private String adminPhone;
+    private String institutionDesc;
 
-    private String adminPassword;
-
-    private Boolean addUserFlag;
-
-    private String userPhone;
+    private String superAdminPassword;
 
-    private String userPassword;
+    private int flag;
 
 }

src/main/java/com/rf/psychological/institution/model/InstitutionEntity.java

@@ -13,19 +13,28 @@ import javax.persistence.Table;
 @NoArgsConstructor
 @AllArgsConstructor
 @Table(name = "t_institution_info")
-@org.hibernate.annotations.Table(appliesTo = "t_institution_info", comment = "机构超级管理员表")
+@org.hibernate.annotations.Table(appliesTo = "t_institution_info", comment = "番号管理")
 public class InstitutionEntity extends BaseEntity {
 
-    @Column(name = "institution_name", columnDefinition = "varchar(50) comment '所属机构名称'")
+    @Column(name = "institution_name", columnDefinition = "varchar(50) comment '番号名称'")
     private String institutionName;
 
-    @Column(name = "institution_no", unique = true, columnDefinition = "varchar(50) comment '所属机构编码'")
+    @Column(name = "institution_no", unique = true, columnDefinition = "varchar(50) not null comment '番号编号'")
     private String institutionNo;
 
-    @Column(name = "login_name", columnDefinition = "varchar(50) comment '登录用户名'")
-    private String loginName;
+    @Column(name = "institution_desc", columnDefinition = "varchar(255) comment '描述'")
+    private String institutionDesc;
 
-    @Column(name = "password", columnDefinition = "varchar(50) comment '登陆密码'")
-    private String password;
+    @Column(name = "is_valid", columnDefinition = "int default 1 comment '是否有效0无效1有效'")
+    private int  isValid;
+
+    @Column(name = "flag", columnDefinition = "int default 0 comment '排序值'")
+    private int  flag;
+
+    @Column(name = "create_time", columnDefinition = "varchar(36) comment '创建时间'")
+    private String createTime;
+
+    @Column(name = "update_time", columnDefinition = "varchar(36) comment '更新时间'")
+    private String updateTime;
 
 }

src/main/java/com/rf/psychological/institution/service/impl/InstitutionServiceImpl.java

@@ -1,14 +1,13 @@
 package com.rf.psychological.institution.service.impl;
 
-import com.rf.psychological.user.dao.model.UserEntity;
+import cn.hutool.core.date.DateUtil;
 import com.rf.psychological.dao.vo.SaveInstitutionVO;
 import com.rf.psychological.enums.UserRole;
 import com.rf.psychological.enums.UserStatus;
-import com.rf.psychological.group.dao.model.GroupEntity;
-import com.rf.psychological.group.service.GroupInfoService;
 import com.rf.psychological.institution.model.InstitutionEntity;
 import com.rf.psychological.institution.repository.InstitutionRepository;
 import com.rf.psychological.institution.service.InstitutionService;
+import com.rf.psychological.user.dao.model.UserEntity;
 import com.rf.psychological.user.service.UserService;
 import com.rf.psychological.utils.Constant;
 import com.rf.psychological.utils.PageRequestUtil;
@@ -35,10 +34,6 @@ public class InstitutionServiceImpl implements InstitutionService {
     @Autowired
     private UserService userService;
 
-    @Autowired
-    private GroupInfoService groupInfoService;
-
-
     @Override
     public void save(InstitutionEntity institutionEntity) {
         this.institutionRepository.save(institutionEntity);
@@ -100,50 +95,13 @@ public class InstitutionServiceImpl implements InstitutionService {
         String institutionNo = saveInstitutionVO.getInstitutionNo();
         String institutionName = saveInstitutionVO.getInstitutionName();
         InstitutionEntity institutionEntity =
-                new InstitutionEntity(institutionName, institutionNo, saveInstitutionVO.getLoginName(), DigestUtils.md5DigestAsHex(saveInstitutionVO.getSuperAdminPassword().getBytes()));
+                new InstitutionEntity(institutionName, institutionNo, saveInstitutionVO.getInstitutionDesc(), 1,saveInstitutionVO.getFlag(), DateUtil.now(),DateUtil.now());
         this.save(institutionEntity);
         UserEntity institutionUserEntity =
                 new UserEntity(institutionNo,institutionName, saveInstitutionVO.getLoginName(),
                         saveInstitutionVO.getLoginName(), DigestUtils.md5DigestAsHex(saveInstitutionVO.getSuperAdminPassword().getBytes()),
                         LocalDate.now().toString(),Constant.DEFAULT_VALUE_ZERO, UserStatus.PASS.getType(), UserRole.SUPERADMIN.getType());
         userService.save(institutionUserEntity);
-        UserEntity  adminEntity =
-                new UserEntity(institutionNo,institutionName, saveInstitutionVO.getAdminPhone(),
-                        saveInstitutionVO.getAdminPhone(), DigestUtils.md5DigestAsHex(saveInstitutionVO.getAdminPassword().getBytes()),
-                        LocalDate.now().toString(),Constant.DEFAULT_VALUE_ZERO, UserStatus.PASS.getType(), UserRole.ADMIN.getType());
-        if (saveInstitutionVO.getAddAdminFlag()) {
-            userService.save(adminEntity);
-        }
-        UserEntity  userEntity = new UserEntity(institutionNo,institutionName, saveInstitutionVO.getUserPhone(),
-                saveInstitutionVO.getUserPhone(), DigestUtils.md5DigestAsHex(saveInstitutionVO.getUserPassword().getBytes()),
-                LocalDate.now().toString(),Constant.DEFAULT_VALUE_ZERO, UserStatus.PASS.getType(), UserRole.COMMON.getType());
-        if (saveInstitutionVO.getAddUserFlag()) {
-            userEntity.setGId(this.addDefaultGroup(saveInstitutionVO.getInstitutionNo(), userEntity.getId()));
-            userService.save(userEntity);
-        }
-        //this.addDefaultGroup(saveInstitutionVO.getInstitutionNo(), userEntity.getId());
-    }
-
-    private String addDefaultGroup(String institutionNo, String userId) {
-        String gid = "";
-        GroupEntity groupEntity1 = this.groupInfoService.findGroupByInstitutionNoAndName(institutionNo, Constant.DEFAULT_GROUP_NAME);
-        //没有默认分组，创建默认分组
-        if (groupEntity1 == null) {
-            GroupEntity groupEntity = new GroupEntity();
-            groupEntity.setGroupName(Constant.DEFAULT_GROUP_NAME);
-            groupEntity.setInstitutionNo(institutionNo);
-            groupEntity = this.groupInfoService.addGroup(groupEntity);
-            //if (!StringUtils.isEmpty(userId)) {
-                gid = groupEntity.getId();
-                //this.userService.updateUserGroup(groupEntity.getId(), userId);
-            //}
-        } else {
-            if (!StringUtils.isEmpty(userId)) {
-                gid = groupEntity1.getId();
-                //this.userService.updateUserGroup(groupEntity1.getId(), userId);
-            }
-        }
-        return gid;
     }
     /**
      * 根据机构编号查询机构信息

src/main/java/com/rf/psychological/utils/Constant.java

@@ -1475,5 +1475,4 @@ public class Constant {
     public static final String USER_PLAN_STATUS_UNCOMPLETED = "0";
     public static final String USER_PLAN_STATUS_COMPLETED = "9";
 
-    public static final String EXCLUDE_PACKAGE_NAME = "wxpay";
 }

src/main/resources/config/application-test.yml

@@ -70,9 +70,6 @@ spring:
         max-idle: 8
         max-active: 8
         min-idle: 0
-
-
-  is_lan: true
 #swagger 显示隐藏配置
 swagger:
   show: true