refactor(资源实体类从json改为dto): 资源实体类从json改为dto

资源实体类从json改为dto

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

@@ -380,49 +380,57 @@ public class ResourceBusiness implements IResourceBusiness {
         String url = resourceConfig.getResourceUrl();
         //获取应用资源
         if(ResourceTypeEnum.TJ_APP.equals(resourceTypeEnum)){
-            Map<String, Object> map = new HashMap<>();
-            map.put("page",pageNo);
-            map.put("size",pageSize);
-            String param = JSON.toJSONString(map);
-            String busSraId = resourceConfig.getAppResource().getBusSraId();
-            String busServiceId = resourceConfig.getAppResource().getBusServiceId();
-            String busServiceFunc = resourceConfig.getAppResource().getBusServiceFunc();
-            List<Header> headerList = getHeaders(busSraId,busServiceId,busServiceFunc);
-            String response = HttpUtil.postForm(url, param, headerList, null);
-            if(null == response){
-                httpResult.setCode(ResponseStatus.FAIL_CODE);
-            } else {
-                JSONObject parse = JSONObject.parseObject(response);
-                httpResult.setCode(ResponseStatus.SUCCESS_CODE);
-                httpResult.setPages(parse.getInteger("totalPages"));
-                httpResult.setTotals(parse.getInteger("total"));
-                httpResult.setRecords(parse.getJSONArray("content"));
-            }
+            getAppResource(pageNo, pageSize, httpResult, url);
         }else if(ResourceTypeEnum.TJ_SERVICE.equals(resourceTypeEnum)){
-            Map<String, Object> map = new HashMap<>();
-            map.put("page",String.valueOf(pageNo));
-            String param = JSON.toJSONString(map);
-            //获取服务资源
-            //服务资源提供方一次查询所有服务资源,未采用分页获取方式
-            String busSraId = resourceConfig.getServiceResource().getBusSraId();
-            String busServiceId = resourceConfig.getServiceResource().getBusServiceId();
-            String busServiceFunc = resourceConfig.getServiceResource().getBusServiceFunc();
-            List<Header> headerList = getHeaders(busSraId,busServiceId,busServiceFunc);
-            String response = HttpUtil.postJSON(url, param,headerList,null);
-            if(null == response){
-                httpResult.setCode(ResponseStatus.FAIL_CODE);
-            } else {
-                JSONObject parse = JSONObject.parseObject(response);
-                JSONObject data = parse.getJSONObject("data");
-                httpResult.setRecords(data.getJSONArray("content"));
-                httpResult.setCode(parse.getString("status"));
-                httpResult.setPages(data.getInteger("totalPages"));
-                httpResult.setTotals(data.getInteger("totalElements"));
-            }
+            getServiceResource(pageNo, httpResult, url);
         }
         return httpResult;
     }
 
+    private void getServiceResource(Integer pageNo, HttpResult httpResult, String url) {
+        Map<String, Object> map = new HashMap<>();
+        map.put("page",String.valueOf(pageNo));
+        String param = JSON.toJSONString(map);
+        //获取服务资源
+        //服务资源提供方一次查询所有服务资源,未采用分页获取方式
+        String busSraId = resourceConfig.getServiceResource().getBusSraId();
+        String busServiceId = resourceConfig.getServiceResource().getBusServiceId();
+        String busServiceFunc = resourceConfig.getServiceResource().getBusServiceFunc();
+        List<Header> headerList = getHeaders(busSraId,busServiceId,busServiceFunc);
+        String response = HttpUtil.postJSON(url, param,headerList,null);
+        if(null == response){
+            httpResult.setCode(ResponseStatus.FAIL_CODE);
+        } else {
+            JSONObject parse = JSONObject.parseObject(response);
+            JSONObject data = parse.getJSONObject("data");
+            httpResult.setRecords(data.getJSONArray("content"));
+            httpResult.setCode(parse.getString("status"));
+            httpResult.setPages(data.getInteger("totalPages"));
+            httpResult.setTotals(data.getInteger("totalElements"));
+        }
+    }
+
+    private void getAppResource(Integer pageNo, Integer pageSize, HttpResult httpResult, String url) {
+        Map<String, Object> map = new HashMap<>();
+        map.put("page",pageNo);
+        map.put("size",pageSize);
+        String param = JSON.toJSONString(map);
+        String busSraId = resourceConfig.getAppResource().getBusSraId();
+        String busServiceId = resourceConfig.getAppResource().getBusServiceId();
+        String busServiceFunc = resourceConfig.getAppResource().getBusServiceFunc();
+        List<Header> headerList = getHeaders(busSraId,busServiceId,busServiceFunc);
+        String response = HttpUtil.postForm(url, param, headerList, null);
+        if(null == response){
+            httpResult.setCode(ResponseStatus.FAIL_CODE);
+        } else {
+            JSONObject parse = JSONObject.parseObject(response);
+            httpResult.setCode(ResponseStatus.SUCCESS_CODE);
+            httpResult.setPages(parse.getInteger("totalPages"));
+            httpResult.setTotals(parse.getInteger("total"));
+            httpResult.setRecords(parse.getJSONArray("content"));
+        }
+    }
+
     private List<Header> getHeaders(String busSraId,String busServiceId,String busServiceFunc) {
         List<Header> heardList = new ArrayList<>();
         Header busSraIdHeader = new BasicHeader("bus_sra_id",busSraId);

dcuc-app-service/src/main/java/com/dragoninfo/dcuc/app/config/DcucResourceConfig.java

@@ -9,7 +9,7 @@ import org.springframework.stereotype.Component;
  * @author mazq
  * @date 2021/2/19
  */
-@ConfigurationProperties(prefix = "dcuc.app.resource")
+@ConfigurationProperties(prefix = "dcuc.app.resource-index")
 @Component
 @Data
 public class DcucResourceConfig {

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

@@ -7,10 +7,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.dragoninfo.dcuc.app.config.DcucResourceConfig;
-import com.dragoninfo.dcuc.app.dto.AppResourceDTO;
-import com.dragoninfo.dcuc.app.dto.MenuResourceDTO;
-import com.dragoninfo.dcuc.app.dto.ResourceDTO;
-import com.dragoninfo.dcuc.app.dto.ServiceResourceDTO;
+import com.dragoninfo.dcuc.app.dto.*;
 import com.dragoninfo.dcuc.app.entity.ApplyInfo;
 import com.dragoninfo.dcuc.app.entity.ResourceSync;
 import com.dragoninfo.dcuc.app.entity.ServiceResource;
@@ -284,17 +281,17 @@ public class ResourceServiceImpl extends BaseMybatisService<ServiceResource,Stri
      */
     private ServiceResourceDTO getServiceResourceDTO(ResourceSync resourceSync) {
         String content = resourceSync.getContent();
-        JSONObject ctj = JSON.parseObject(content);
+        ServiceResourceAcceptDTO acceptDTO = JSON.parseObject(content,ServiceResourceAcceptDTO.class);
         ServiceResourceDTO dto = new ServiceResourceDTO();
         ResourceTypeEnum resourceEnum = ResourceTypeEnum.getByResourceId(resourceSync.getResourceId());
         dto.setResourceId(resourceEnum.getResourceId());
         dto.setResourceType(resourceEnum.getResourceType());
         dto.setResourceProvider(resourceEnum.getResouProvider());
-        dto.setServiceCode(ctj.getString("FWZYBSF"));
-        dto.setServiceName(ctj.getString("FWZYMC"));
-        dto.setBuildUnitCode(ctj.getString("XXCZDW_GAJGJGDM"));
-        dto.setServiceUrl(ctj.getString("FWFWDZ"));
-        dto.setServiceStatus(ctj.getString("FWZYZTDM"));
+        dto.setServiceCode(acceptDTO.getFWZYBSF());
+        dto.setServiceName(acceptDTO.getFWZYMC());
+        dto.setBuildUnitCode(acceptDTO.getXXCZDW_GAJGJGDM());
+        dto.setServiceUrl(acceptDTO.getFWFWDZ());
+        dto.setServiceStatus(acceptDTO.getFWZYZTDM());
         return dto;
     }
 
@@ -306,17 +303,17 @@ public class ResourceServiceImpl extends BaseMybatisService<ServiceResource,Stri
     private AppResourceDTO getAppResourceDTO(ResourceSync resourceSync) {
         String content = resourceSync.getContent();
         AppResourceDTO dto = new AppResourceDTO();
-        JSONObject ctj = JSON.parseObject(content);
+        AppInfoAcceptDTO acceptDTO = JSON.parseObject(content, AppInfoAcceptDTO.class);
         ResourceTypeEnum resourceEnum = ResourceTypeEnum.getByResourceId(resourceSync.getResourceId());
         dto.setResourceId(resourceEnum.getResourceId());
         dto.setResourceType(resourceEnum.getResourceType());
         dto.setResourceProvider(resourceEnum.getResouProvider());
-        dto.setAppCode(ctj.getString("yyxtbh"));
-        dto.setAppName(ctj.getString("yyxtmc"));
-        dto.setAppStatus(ctj.getString("xtzybs"));
-        dto.setAppUrl(ctj.getString("yyxtfwdz"));
-        dto.setBuildUnitCode(ctj.getString("yyxtgldwdm"));
-        String sxrq = ctj.getString("sxrq");
+        dto.setAppCode(acceptDTO.getYyxtbh());
+        dto.setAppName(acceptDTO.getYyxtmc());
+        dto.setAppStatus(acceptDTO.getXtzybs());
+        dto.setAppUrl(acceptDTO.getYyxtfwdz());
+        dto.setBuildUnitCode(acceptDTO.getYyxtgldwdm());
+        String sxrq = acceptDTO.getSxrq();
         if(!StringUtils.isEmpty(sxrq)){
             SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
             try {
@@ -326,8 +323,8 @@ public class ResourceServiceImpl extends BaseMybatisService<ServiceResource,Stri
 
             }
         }
-        dto.setApplyCategory(ctj.getString("yyxtfldm"));
-        dto.setPoliceSpecies(ctj.getString("gajzfldm"));
+        dto.setApplyCategory(acceptDTO.getYyxtfldm());
+        dto.setPoliceSpecies(acceptDTO.getGajzfldm());
         return dto;
     }
 

dcuc-app-service/src/main/resources/application-app.yml

@@ -7,10 +7,7 @@ dcuc:
       app-change-topic: 10000023
       manufacturer-change-topic: 10000022
       manufacturer-change-enable: false
-    service-index:
-      #应用资源是否需要保存菜单
-      menuEnabled: true
-    resource:
+    resource-index:
       #应用资源请求参数
       pageSize: 50
       app-resource: