调整

gly-base-core/src/main/java/cn/com/taiji/core/entity/user/AssBlackStaff.java

@@ -49,7 +49,6 @@ public class AssBlackStaff extends StringPropertyUUIDEntity {
     private LocalDateTime staffOutTime;
 
     @Column(name = "REASON_OUT")
-    @NotBlank
     private String reasonOut;//反白原因
 
     @Column(name = "ID_NUM")

zhywpt-app-userw/src/main/java/cn/com/taiji/userw/api/system/BlackStaffController.java

@@ -18,7 +18,7 @@ import javax.validation.Valid;
 
 @Api(tags = {"员工下黑管理"})
 @RestController
-@RequestMapping("/staffIn")
+@RequestMapping("/blackStaff")
 public class BlackStaffController extends MyValidController {
     @Autowired
     private BlackStaffManager manager;

zhywpt-app-userw/src/main/java/cn/com/taiji/userw/config/AppConfig.java

@@ -83,16 +83,16 @@ public class AppConfig extends AbstractManager {
         return new SequenceJdbcDao(dataSource, MyFinals.SEQUENCE_NUM_TABLE, 0L);
     }
     //本地前端联调跨域
-//    @Bean
-//    public WebMvcConfigurer corsConfigurer() {
-//        return new WebMvcConfigurer() {
-//            @Override
-//            public void addCorsMappings(CorsRegistry registry) {
-//                registry.addMapping("/**")
-//                        .allowedOrigins("*")
-//                        .allowedMethods("GET", "POST", "PUT", "DELETE", "OPTIONS")
-//                        .allowedHeaders("*");
-//            }
-//        };
-//    }
+    @Bean
+    public WebMvcConfigurer corsConfigurer() {
+        return new WebMvcConfigurer() {
+            @Override
+            public void addCorsMappings(CorsRegistry registry) {
+                registry.addMapping("/**")
+                        .allowedOrigins("*")
+                        .allowedMethods("GET", "POST", "PUT", "DELETE", "OPTIONS")
+                        .allowedHeaders("*");
+            }
+        };
+    }
 }

zhywpt-app-userw/src/main/java/cn/com/taiji/userw/dto/system/BlackStaffInRequestDTO.java

@@ -6,14 +6,8 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.experimental.Accessors;
-
-import javax.persistence.Column;
-import javax.persistence.EnumType;
-import javax.persistence.Enumerated;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Size;
-import java.time.LocalDateTime;
 
 @Getter
 @Setter
@@ -28,10 +22,10 @@ public class BlackStaffInRequestDTO extends AbstractBizRequestDTO {
 
     @ApiModelProperty(value = "证件类型")
     @NotNull
-    private IdType idType;
+    private Integer idType;
 
     @ApiModelProperty(value = "下黑原因")
     @NotBlank
-    private String reasonIn;
+    private String reason;
 
 }

zhywpt-app-userw/src/main/java/cn/com/taiji/userw/dto/system/BlackStaffOutRequestDTO.java

@@ -18,6 +18,6 @@ public class BlackStaffOutRequestDTO extends AbstractBizRequestDTO {
 
     @ApiModelProperty(value = "反白原因")
     @NotBlank
-    private String reasonOut;
+    private String reason;
 
 }

zhywpt-app-userw/src/main/java/cn/com/taiji/userw/manager/system/BlackStaffManagerImpl.java

@@ -2,6 +2,8 @@ package cn.com.taiji.userw.manager.system;
 
 import cn.com.taiji.common.manager.ManagerException;
 import cn.com.taiji.common.model.dao.Pagination;
+import cn.com.taiji.common.pub.CollectionTools;
+import cn.com.taiji.core.entity.dict.basic.IdType;
 import cn.com.taiji.core.entity.dict.user.StaffChangeType;
 import cn.com.taiji.core.entity.user.AccountInfo;
 import cn.com.taiji.core.entity.user.AssBlackStaff;
@@ -16,6 +18,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.time.LocalDateTime;
+import java.util.List;
 
 @Service
 public class BlackStaffManagerImpl extends AbstractUserwManager implements BlackStaffManager {
@@ -35,6 +38,7 @@ public class BlackStaffManagerImpl extends AbstractUserwManager implements Black
         return blackStaffRepo.page(pageRequest).convertResult(item -> {
             AssBlackStaff blackStaff = (AssBlackStaff) item;
             BlackStaffModel model = copyProperties(blackStaff, new BlackStaffModel());
+            model.setIdType(blackStaff.getIdType().getCode());
             AccountInfo byOpenId1 = accountInfoRepo.findByOpenId(blackStaff.getCreateOpenId());
             if (byOpenId1 != null){
                 model.setCreateUserName(byOpenId1.getUserName());
@@ -58,7 +62,7 @@ public class BlackStaffManagerImpl extends AbstractUserwManager implements Black
         blackStaff.setStatus(2);
         blackStaff.setStaffOutTime(now);
         blackStaff.setUpdateOpenId(findOpenIdByToken(dto.getAccessToken()));
-        blackStaff.setReasonOut(dto.getReasonOut());
+        blackStaff.setReasonOut(dto.getReason());
         blackStaffRepo.merge(blackStaff);
         //更新员工状态
         AccountInfo accountInfo = accountInfoRepo.findByIdNumAndIdType(blackStaff.getIdNum(), blackStaff.getIdType());
@@ -70,7 +74,7 @@ public class BlackStaffManagerImpl extends AbstractUserwManager implements Black
                 staff.setUpdateTime(now);
                 staffRepo.merge(staff);
                 //记录修改状态日志
-                staffManager.saveStaffChangeLog(staff.getStaffId(), "员工反白："+dto.getReasonOut(), findOpenIdByToken(dto.getAccessToken()), StaffChangeType.STATUS);
+                staffManager.saveStaffChangeLog(staff.getStaffId(), "员工反白："+dto.getReason(), findOpenIdByToken(dto.getAccessToken()), StaffChangeType.STATUS);
             }
         }
         return new BlackStaffOutResponseDTO();
@@ -79,12 +83,24 @@ public class BlackStaffManagerImpl extends AbstractUserwManager implements Black
     @Override
     @Transactional(rollbackFor = Exception.class)
     public BlackStaffInResponseDTO staffIn(BlackStaffInRequestDTO dto) throws ManagerException {
+        IdType idType = IdType.findByCode(dto.getIdType());
+        if (idType == null){
+            throw new ManagerException("证件类型异常");
+        }
+        List<AssBlackStaff> blackStaffs = blackStaffRepo.queryByIdNumAndIdType(dto.getIdNum(), IdType.findByCode(dto.getIdType()), 1);
+        if (!CollectionTools.isEmpty(blackStaffs)){
+            throw new ManagerException("该证件号码和证件类型已下黑");
+        }
+
         AssBlackStaff blackStaff = copyProperties(dto, new AssBlackStaff());
+        blackStaff.setIdType(idType);
+        blackStaff.setReasonIn(dto.getReason());
         LocalDateTime now = LocalDateTime.now();
         blackStaff.setStatus(1);
         blackStaff.setStaffInTime(now);
         blackStaff.setCreateOpenId(findOpenIdByToken(dto.getAccessToken()));
-        AccountInfo accountInfo = accountInfoRepo.findByIdNumAndIdType(dto.getIdNum(), dto.getIdType());
+
+        AccountInfo accountInfo = accountInfoRepo.findByIdNumAndIdType(dto.getIdNum(), idType);
         if (accountInfo != null){
             Staff staff = staffRepo.findByOpenId(accountInfo.getOpenId());
             if (staff != null){
@@ -94,8 +110,10 @@ public class BlackStaffManagerImpl extends AbstractUserwManager implements Black
                 staff.setUpdateOpenId(findOpenIdByToken(dto.getAccessToken()));
                 staff.setUpdateTime(now);
                 staffRepo.merge(staff);
+                //删除openId缓存
+                deleteTokenByOpenId(staff.getOpenId());
                 //记录修改状态日志
-                staffManager.saveStaffChangeLog(staff.getStaffId(), "员工下黑："+dto.getReasonIn(), findOpenIdByToken(dto.getAccessToken()), StaffChangeType.STATUS);
+                staffManager.saveStaffChangeLog(staff.getStaffId(), "员工下黑："+dto.getReason(), findOpenIdByToken(dto.getAccessToken()), StaffChangeType.STATUS);
             }
         }
         blackStaffRepo.persist(blackStaff);

zhywpt-app-userw/src/main/java/cn/com/taiji/userw/model/system/BlackStaffModel.java

@@ -1,7 +1,6 @@
 package cn.com.taiji.userw.model.system;
 
 import cn.com.taiji.common.model.BaseModel;
-import cn.com.taiji.core.entity.dict.basic.IdType;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.experimental.Accessors;
@@ -14,6 +13,8 @@ import java.time.LocalDateTime;
 @Accessors(chain = true)
 public class BlackStaffModel extends BaseModel {
 
+    private String id;
+
     private Integer status;//状态，1-下黑，2-已反白
 
     private String createUserName;//下黑添加人
@@ -32,6 +33,6 @@ public class BlackStaffModel extends BaseModel {
 
     private String idNum;// 用户-证件号码
 
-    private IdType idType;// 用户-证件类型
+    private Integer idType;// 用户-证件类型
 
 }

zhywpt-service-ias/src/main/java/cn/com/taiji/ias/manager/portal/AbstractLoginManager.java

@@ -20,6 +20,8 @@ public abstract class AbstractLoginManager extends RedisCacheManager {
             throw GlyServiceError.BUSINESS_VALIDATE_ERR.toHandleException("非员工账号，暂不支持登录该系统！");
         if (staff.getStatus() == 2)// DISABLE
             throw GlyServiceError.BUSINESS_VALIDATE_ERR.toHandleException("该员工账号已经被停用，暂不支持登录该系统！");
+        if (staff.getStatus() == -1)// BLACK
+            throw GlyServiceError.BUSINESS_VALIDATE_ERR.toHandleException("该员工账号已经被下黑，暂不支持登录该系统！");
         if (!hasText(staff.getServiceHallId().trim()) || !hasText(staff.getAgencyId().trim())
                 || !hasText(staff.getStaffId().trim()) || !hasText(staff.getIdentityType().trim()))
             throw GlyServiceError.BUSINESS_VALIDATE_ERR.toHandleException("该账号无权访问当前系统！");