fix(主客体授权bug修改): 主客体授权bug修改

1.app-service服务列表查询未删除的数据
2.auth-service用户主体添加省份字段
3.dcuc-duceap新增表码枚举类

dcuc-app-api/src/main/java/com/dragoninfo/dcuc/app/facade/IApplyInfoFacade.java

@@ -273,4 +273,12 @@ public interface IApplyInfoFacade {
      */
     @PostMapping(value = "/import")
     ResponseStatus impExcel(@RequestParam("fileId") String fileId);
+
+    /**
+     * 根据查询条件查询应用
+     * @param searchDTO
+     * @return
+     */
+    @RequestMapping(value = "findList")
+    List<ApplyInfo> findList(SearchDTO searchDTO);
 }

dcuc-app-service/src/main/java/com/dragoninfo/dcuc/app/facade/ApplyInfoFacade.java

@@ -7,6 +7,7 @@ import com.dragonsoft.duceap.auditlog.annotations.AuditLog;
 import com.dragonsoft.duceap.auditlog.enums.OperateTypeEnum;
 import com.dragonsoft.duceap.base.entity.http.ResponseStatus;
 import com.dragonsoft.duceap.base.entity.search.SearchDTO;
+import com.dragonsoft.duceap.core.search.Searchable;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -68,6 +69,11 @@ public class ApplyInfoFacade implements IApplyInfoFacade {
         return applyInfoService.impExcel(fileId);
     }
 
+    @Override
+    public List<ApplyInfo> findList(SearchDTO searchDTO) {
+        return applyInfoService.findAll(Searchable.toSearchable(searchDTO));
+    }
+
     @AuditLog(actionType = "找到最新的排序", operateType = OperateTypeEnum.SEARCH)
     @Override
     public String getNewSort() {

dcuc-app-service/src/main/java/com/dragoninfo/dcuc/app/service/impl/ServiceResourceServiceImpl.java

@@ -11,14 +11,12 @@ import com.dragoninfo.dcuc.app.facade.IApplyInfoFacade;
 import com.dragoninfo.dcuc.app.mapper.ServiceResourceMapper;
 import com.dragoninfo.dcuc.app.service.IServiceResourceService;
 import com.dragoninfo.dcuc.app.vo.ServiceResourceVo;
-import com.dragoninfo.dcuc.auth.auth.enumresources.ServiceProvideWayEnum;
 import com.dragoninfo.dcuc.auth.auth.enumresources.YesNotEnum;
+import com.dragoninfo.dcuc.duceap.enums.ServiceProvideWayEnum;
 import com.dragoninfo.dcuc.duceap.facade.IDuceapUploadFacade;
 import com.dragoninfo.dcuc.duceap.upload.dto.DocContentDTO;
-import com.dragoninfo.duceap.core.response.Result;
 import com.dragonsoft.duceap.base.entity.http.ResponseStatus;
 import com.dragonsoft.duceap.base.enums.BooleanEnum;
-import com.dragonsoft.duceap.commons.util.json.JsonUtils;
 import com.dragonsoft.duceap.commons.util.string.StringUtils;
 import com.dragonsoft.duceap.core.search.Searchable;
 import com.dragonsoft.duceap.core.search.enums.SearchOperator;
@@ -39,7 +37,9 @@ import javax.annotation.Resource;
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.io.InputStream;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
 
 /**
  * @author huangzqa
@@ -100,6 +100,7 @@ public class ServiceResourceServiceImpl extends BaseMybatisService<ServiceResour
      */
     @Override
     public Page<ServiceResourceVo> page(Searchable searchable) {
+        searchable.addSearchFilter("deleted", SearchOperator.eq, BooleanEnum.FALSE.value);
         Page<ServiceResource> serviceResources = serviceResourceMapper.pagingBySearchable(searchable);
         List<ServiceResourceVo> result = new ArrayList<>();
         if (CollectionUtils.isNotEmpty(serviceResources.getContent())){
@@ -204,9 +205,10 @@ public class ServiceResourceServiceImpl extends BaseMybatisService<ServiceResour
     public ResponseStatus deleteServiceResourceById(String id) {
         ServiceResource serviceResource = serviceResourceMapper.selectById(id);
         if (serviceResource != null){
-            serviceResource.setDeleted(YesNotEnum.YES.getValue());
+            serviceResource.setDeleted(BooleanEnum.TRUE.getValue());
             serviceResource.setUpdateTime(new Date());
             serviceResourceMapper.updateById(serviceResource);
+            serviceResourceMapper.deleteById(id);
         }
         return new ResponseStatus();
     }