change use icode...

dcuc-auth-service/src/main/java/com/dragoninfo/dcuc/auth/admin/repo/PoliceTypeRepository.java

@@ -1,38 +0,0 @@
-package com.dragoninfo.dcuc.auth.admin.repo;
-
-import com.dragonsoft.duceap.base.annotations.query.NativeQuery;
-import com.dragonsoft.duceap.core.search.Searchable;
-import org.springframework.jdbc.core.JdbcTemplate;
-import org.springframework.stereotype.Repository;
-
-import javax.sql.DataSource;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-import java.util.stream.Collectors;
-
-/**
- * @author Lvzr
- * Created at 2021/09/22 10:34.
- */
-@Repository
-public class PoliceTypeRepository {
-
-    private final JdbcTemplate jdbcTemplate;
-
-    public PoliceTypeRepository(DataSource dataSource) {
-        this.jdbcTemplate = new JdbcTemplate(dataSource);
-    }
-
-
-    public Map<String, String> listAll() {
-        return jdbcTemplate.queryForList("SELECT CODE,VALUE FROM t_md_police_type")
-                .stream()
-                .collect(Collectors.toMap(map -> map.get("CODE").toString(),
-                        map -> Optional.ofNullable(map.get("VALUE")).orElse("").toString()));
-    }
-
-    public String getPoliceTypeByCode(String code) {
-        return jdbcTemplate.queryForObject("SELECT VALUE FROM t_md_police_type WHERE CODE=?", String.class, code);
-    }
-}

dcuc-auth-service/src/main/java/com/dragoninfo/dcuc/auth/admin/service/impl/ManageInfoService.java

@@ -7,7 +7,6 @@ import com.dragoninfo.dcuc.auth.admin.entity.TempMtAuth;
 import com.dragoninfo.dcuc.auth.admin.enumresource.AdminObjectTypeEnum;
 import com.dragoninfo.dcuc.auth.admin.enumresource.AdminOperateTypeEnum;
 import com.dragoninfo.dcuc.auth.admin.repo.ManageInfoRepository;
-import com.dragoninfo.dcuc.auth.admin.repo.PoliceTypeRepository;
 import com.dragoninfo.dcuc.auth.admin.service.IAppMtAuthService;
 import com.dragoninfo.dcuc.auth.admin.service.IManageInfoService;
 import com.dragoninfo.dcuc.auth.admin.service.IMgeLogService;
@@ -16,10 +15,12 @@ import com.dragoninfo.dcuc.auth.admin.vo.AdminAuditVO;
 import com.dragoninfo.dcuc.auth.sub.dto.AuthUserDTO;
 import com.dragoninfo.dcuc.auth.sub.entity.AuthUserInfo;
 import com.dragoninfo.dcuc.auth.sub.service.IAuthUserInfoService;
+import com.dragoninfo.dcuc.duceap.facade.ICodeListResourceFacade;
 import com.dragoninfo.dcuc.org.facade.IOrgInfoFacade;
 import com.dragoninfo.dcuc.org.vo.OrgTreeNode;
 import com.dragoninfo.duceap.commons.util.server.OrgInfoUtil;
 import com.dragonsoft.duceap.base.entity.http.ResponseStatus;
+import com.dragonsoft.duceap.base.entity.metadata.CodeRecord;
 import com.dragonsoft.duceap.base.entity.search.SearchDTO;
 import com.dragonsoft.duceap.base.entity.security.BaseSecurityUser;
 import com.dragonsoft.duceap.base.entity.security.SecurityUser;
@@ -68,13 +69,14 @@ public class ManageInfoService implements IManageInfoService {
     @Autowired
     private IOrgInfoFacade orgInfoFacade;
 
-    private final PoliceTypeRepository policeTypeRepository;
+    private final ICodeListResourceFacade codeListResourceFacade;
 
     private final Map<String, String> POLICE_CATEGORY_MAP;
 
-    public ManageInfoService(PoliceTypeRepository policeTypeRepository) {
-        this.policeTypeRepository = policeTypeRepository;
-        this.POLICE_CATEGORY_MAP = policeTypeRepository.listAll();
+    public ManageInfoService(ICodeListResourceFacade codeListResourceFacade) {
+        this.codeListResourceFacade = codeListResourceFacade;
+        this.POLICE_CATEGORY_MAP = codeListResourceFacade.listCode("code", "T_MD_POLICE_TYPE").stream()
+                .collect(Collectors.toMap(CodeRecord::getValue,CodeRecord::getLabel));
     }
 
     /**
@@ -297,15 +299,10 @@ public class ManageInfoService implements IManageInfoService {
             AuthUserDTO dto = new AuthUserDTO();
             BeanUtils.copyProperties(e, dto);
             final String code;
-            String value;
             if (null == (code = e.getPoliceCategory())) {
                 return dto;
             }
-            if (null == (value = POLICE_CATEGORY_MAP.get(code))) {
-                value = policeTypeRepository.getPoliceTypeByCode(code);
-                POLICE_CATEGORY_MAP.put(code, value);
-            }
-            dto.setPoliceCategory(value);
+            dto.setPoliceCategory(POLICE_CATEGORY_MAP.get(code));
             return dto;
         }).filter(el-> el != null).collect(Collectors.toList());
         return new PageImpl<>(collect, searchable.getPage(), userInfoPage.getTotalElements());