Merge branch 'huangjy-sub-obj-210426' into 'feature/v2.3.0-sub-obj'

资源接口代码合并

See merge request dcuc-tjdsj/app-service!27

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

@@ -1,6 +1,7 @@
 package com.dragoninfo.dcuc.app.facade;
 
 import com.dragoninfo.dcuc.app.entity.ServiceResource;
+import com.dragoninfo.dcuc.app.vo.ServiceResourceVo;
 import com.dragonsoft.duceap.base.entity.search.SearchDTO;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.data.domain.Page;
@@ -38,4 +39,11 @@ public interface IServiceResourceFacade {
      */
     @PostMapping(value = "getByCodes")
     List<ServiceResource> getServiceByServiceCodes(@RequestBody List<String> list);
+
+    /**
+     * 服务资源列表分页查询
+     * @return
+     */
+    @PostMapping(value = "/search")
+    Page<ServiceResourceVo> page(@RequestBody SearchDTO toSearchDTO);
 }

dcuc-app-model/src/main/java/com/dragoninfo/dcuc/app/dto/AppResourceDTO.java

@@ -1,5 +1,6 @@
 package com.dragoninfo.dcuc.app.dto;
 
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -49,6 +50,26 @@ public class AppResourceDTO extends ResourceDTO implements Serializable {
      */
     private Date registrationTime;
 
+    /**
+     * 应用系统运维单位名称
+     */
+    private String appOpsDepName;
+
+    /**
+     * 应用系统事权单位代码
+     */
+    private String managerOrgCode;
+
+    /**
+     * 应用英文名称
+     */
+    private String appEnglishName;
+
+    /**
+     * 上线日期
+     */
+    private String lineTime;
+
     /**
      * 应用关联菜单DTOs
      */

dcuc-app-model/src/main/java/com/dragoninfo/dcuc/app/dto/MenuResourceDTO.java

@@ -15,4 +15,13 @@ public class MenuResourceDTO {
     private String funName;
     private String status;
     private String appCode;
+    /**
+     * 功能使用场景代码
+     */
+    private String functionUsageScenarios;
+
+    /**
+     * 设计安全隐私类别
+     */
+    private String designSecureType;
 }

dcuc-app-model/src/main/java/com/dragoninfo/dcuc/app/dto/ServiceResourceAcceptDTO.java

@@ -52,4 +52,8 @@ public class ServiceResourceAcceptDTO {
      * 信息创建单位——GA机构机构代码
      */
     private String XXCZDW_GAJGJGDM;
+    /**
+     * 服务提供方式代码
+     */
+    private String FWTGFSDM;
 }

dcuc-app-model/src/main/java/com/dragoninfo/dcuc/app/dto/ServiceResourceDTO.java

@@ -32,6 +32,22 @@ public class ServiceResourceDTO extends ResourceDTO implements Serializable {
      * 服务访问地址
      */
     private String serviceUrl;
+    /**
+     * 服务类型
+     */
+    private String serviceType;
+    /**
+     * 服务提供方式
+     */
+    private String serviceProvideWay;
+    /**
+     * 是否自用服务
+     */
+    private String mustSelf;
+    /**
+     * 服务提供应用系统code
+     */
+    private String appCode;
 
     public ServiceResourceDTO() {
         super();

dcuc-app-model/src/main/java/com/dragoninfo/dcuc/app/entity/ApplyInfo.java

@@ -45,6 +45,9 @@ public class ApplyInfo implements Serializable {
     @ApiModelProperty(value = "所属单位名称")
     private String orgName;
 
+    @ApiModelProperty(value = "应用系统事权单位代码")
+    private String managerOrgCode;
+
     @ApiModelProperty(value = "管理单位id")
     private String managerOrgId;
 
@@ -113,4 +116,12 @@ public class ApplyInfo implements Serializable {
     @ApiModelProperty(value = "单位负责人电话")
     private String jgFzrPhone;
 
+    @ApiModelProperty(value = "应用系统运维单位名称")
+    private String appOpsDepName;
+
+    @ApiModelProperty(value = "应用英文名称")
+    private String appEnglishName;
+
+    @ApiModelProperty(value = "上线日期")
+    private String lineTime;
 }

dcuc-app-model/src/main/java/com/dragoninfo/dcuc/app/entity/ServiceResource.java

@@ -38,7 +38,7 @@ public class ServiceResource implements Serializable {
     private String resourceProvider;
 
     /**
-     * 服务编码
+     * 服务资源标识符
      */
     private String serviceCode;
 
@@ -139,4 +139,21 @@ public class ServiceResource implements Serializable {
      */
     private Date updateTime;
 
+    /**
+     * 服务类型
+     */
+    private String serviceType;
+    /**
+     * 服务提供方式
+     */
+    private String serviceProvideWay;
+    /**
+     * 是否自用服务
+     */
+    private String mustSelf;
+    /**
+     * 服务提供应用系统code
+     */
+    private String appCode;
+
 }

dcuc-app-model/src/main/java/com/dragoninfo/dcuc/app/vo/ServiceResourceVo.java

@@ -0,0 +1,164 @@
+package com.dragoninfo.dcuc.app.vo;
+
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 代码千万行,注释第一行,编码不规范,同事两行泪
+ *
+ * @author huang(jy)
+ * @version 1.0
+ * @date 2021/4/28 11:38
+ */
+@ApiModel(value = "服务资源VO")
+public class ServiceResourceVo implements Serializable {
+
+    private String id;
+
+    @ApiModelProperty(value = "资源id")
+    private String resourceId;
+
+    @ApiModelProperty(value = "资源类型")
+    private String resourceType;
+
+
+    @ApiModelProperty(value = "服务资源标识符")
+    private String serviceCode;
+
+    @ApiModelProperty(value = "服务名称")
+    private String serviceName;
+
+    @ApiModelProperty(value = "服务资源状态代码 0：未激活；1：启用；2：停止；3：撤销；")
+    private String serviceStatus;
+
+    @ApiModelProperty(value = "服务访问地址")
+    private String serviceUrl;
+
+
+    @ApiModelProperty(value = "创建时间")
+    private Date createTime;
+
+
+    @ApiModelProperty(value = "服务类型")
+    private String serviceType;
+
+    @ApiModelProperty(value = "服务提供方式")
+    private String serviceProvideWay;
+
+    @ApiModelProperty(value = "是否自用服务,0:否，1：是")
+    private String mustSelf;
+
+    @ApiModelProperty(value = "服务提供应用系统code")
+    private String appCode;
+
+    @ApiModelProperty(value = "服务提供应用系统名称")
+    private String appName;
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getResourceId() {
+        return resourceId;
+    }
+
+    public void setResourceId(String resourceId) {
+        this.resourceId = resourceId;
+    }
+
+    public String getResourceType() {
+        return resourceType;
+    }
+
+    public void setResourceType(String resourceType) {
+        this.resourceType = resourceType;
+    }
+
+    public String getServiceCode() {
+        return serviceCode;
+    }
+
+    public void setServiceCode(String serviceCode) {
+        this.serviceCode = serviceCode;
+    }
+
+    public String getServiceName() {
+        return serviceName;
+    }
+
+    public void setServiceName(String serviceName) {
+        this.serviceName = serviceName;
+    }
+
+    public String getServiceStatus() {
+        return serviceStatus;
+    }
+
+    public void setServiceStatus(String serviceStatus) {
+        this.serviceStatus = serviceStatus;
+    }
+
+    public String getServiceUrl() {
+        return serviceUrl;
+    }
+
+    public void setServiceUrl(String serviceUrl) {
+        this.serviceUrl = serviceUrl;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public String getServiceType() {
+        return serviceType;
+    }
+
+    public void setServiceType(String serviceType) {
+        this.serviceType = serviceType;
+    }
+
+    public String getServiceProvideWay() {
+        return serviceProvideWay;
+    }
+
+    public void setServiceProvideWay(String serviceProvideWay) {
+        this.serviceProvideWay = serviceProvideWay;
+    }
+
+    public String getMustSelf() {
+        return mustSelf;
+    }
+
+    public void setMustSelf(String mustSelf) {
+        this.mustSelf = mustSelf;
+    }
+
+    public String getAppCode() {
+        return appCode;
+    }
+
+    public void setAppCode(String appCode) {
+        this.appCode = appCode;
+    }
+
+    public String getAppName() {
+        return appName;
+    }
+
+    public void setAppName(String appName) {
+        this.appName = appName;
+    }
+}

dcuc-app-service/pom.xml

@@ -113,7 +113,7 @@
         <dependency>
             <groupId>com.dragoninfo</groupId>
             <artifactId>dcuc-auth-api</artifactId>
-            <version>2.1.0-tjdsj-SNAPSHOT</version>
+            <version>2.3.0-tjdsj-SNAPSHOT</version>
         </dependency>
         <!--配置 dcuc 结束-->
 
@@ -232,9 +232,9 @@
                                     <goal>copy-dependencies</goal>
                                 </goals>
                                 <configuration>
-                                    <!--   &lt;!&ndash;排除licenseignore包，用来禁用许可开关，防止生产环境通过关闭开关，绕过许可&ndash;&gt;
-                                       <excludeArtifactIds>duceap-support-licenseignore</excludeArtifactIds>-->
-                                    <!--<excludeScope>provided</excludeScope>-->
+                                    <!--排除licenseignore包，用来禁用许可开关，防止生产环境通过关闭开关，绕过许可-->
+                                    <excludeArtifactIds>duceap-support-licenseignore</excludeArtifactIds>
+                                    <excludeScope>provided</excludeScope>
                                     <outputDirectory>${project.build.directory}/lib</outputDirectory>
                                     <!--取消依赖包的时间戳-->
                                     <useBaseVersion>true</useBaseVersion>

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

@@ -361,6 +361,11 @@ public class ResourceBusiness implements IResourceBusiness {
         }
         dto.setApplyCategory(appInfoAcceptDTO.getYyxtfldm());
         dto.setPoliceSpecies(appInfoAcceptDTO.getGajzfldm());
+        dto.setAppOpsDepName(appInfoAcceptDTO.getYyxtywdwmc());
+        dto.setManagerOrgCode(appInfoAcceptDTO.getYyxtsqdwdm());
+        dto.setLineTime(appInfoAcceptDTO.getSxrq());
+        //TODO 资源目录未返回应用英文名，所以先注释
+//        dto.setAppEnglishName();
         //设置菜单资源
         List<MenuResourceAcceptDTO> tAppFunctionList = acceptDTO.getTappFunctionList();
         List<MenuResourceDTO> menusDTOs = new ArrayList<>();
@@ -371,6 +376,8 @@ public class ResourceBusiness implements IResourceBusiness {
             menuDTO.setFunName(mADTO.getGnmc());
             menuDTO.setAppCode(appInfoAcceptDTO.getYyxtbh());
             menuDTO.setStatus(mADTO.getZyzt());
+            menuDTO.setDesignSecureType(mADTO.getSjaqyslb());
+            menuDTO.setFunctionUsageScenarios(mADTO.getGnsycjdm());
             menusDTOs.add(menuDTO);
         }
         dto.setMenusResources(menusDTOs);
@@ -416,6 +423,11 @@ public class ResourceBusiness implements IResourceBusiness {
         if (ServiceStatusCons.STATUS_DELETED.equals(fwzyztdm)) {
             dto.setDeleted(BooleanEnum.TRUE.getValue());
         }
+        dto.setServiceType(acceptDTO.getFWLXDM());
+        dto.setServiceProvideWay(acceptDTO.getFWTGFSDM());
+        //是否自用服务，服务资源未返回
+//        dto.setMustSelf();
+        dto.setAppCode(acceptDTO.getTGFWZYD_YYZYBS());
         return dto;
     }
 

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

@@ -2,6 +2,7 @@ package com.dragoninfo.dcuc.app.facade;
 
 import com.dragoninfo.dcuc.app.entity.ServiceResource;
 import com.dragoninfo.dcuc.app.service.IServiceResourceService;
+import com.dragoninfo.dcuc.app.vo.ServiceResourceVo;
 import com.dragonsoft.duceap.base.entity.search.SearchDTO;
 import com.dragonsoft.duceap.core.search.Searchable;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -37,4 +38,12 @@ public class ServiceResourceFacade implements IServiceResourceFacade {
     public List<ServiceResource> getServiceByServiceCodes(List<String> list) {
         return serviceResourceService.getServiceByServiceCodes(list);
     }
+    /**
+     * 服务资源列表分页查询
+     * @return
+     */
+    @Override
+    public Page<ServiceResourceVo> page(SearchDTO searchDTO) {
+        return serviceResourceService.page(Searchable.toSearchable(searchDTO));
+    }
 }

dcuc-app-service/src/main/java/com/dragoninfo/dcuc/app/service/IServiceResourceService.java

@@ -2,6 +2,7 @@ package com.dragoninfo.dcuc.app.service;
 
 import com.dragoninfo.dcuc.app.dto.ServiceResourceDTO;
 import com.dragoninfo.dcuc.app.entity.ServiceResource;
+import com.dragoninfo.dcuc.app.vo.ServiceResourceVo;
 import com.dragonsoft.duceap.core.search.Searchable;
 import com.dragonsoft.duceap.core.service.IBaseService;
 import org.springframework.data.domain.Page;
@@ -40,4 +41,9 @@ public interface IServiceResourceService extends IBaseService<ServiceResource, S
      * @return
      */
     boolean updateById(ServiceResourceDTO dto);
+    /**
+     * 服务资源列表分页查询
+     * @return
+     */
+    Page<ServiceResourceVo> page(Searchable toSearchable);
 }

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

@@ -263,6 +263,8 @@ public class ResourceServiceImpl extends BaseMybatisService<ServiceResource,Stri
                 }
                 appFunInfo.setAppId(appId);
             }
+            appFunInfo.setDesignSecureType(dto.getDesignSecureType());
+            appFunInfo.setFunctionUsageScenarios(dto.getFunctionUsageScenarios());
             funList.add(appFunInfo);
         }
         if(CollectionUtils.isNotEmpty(funList)){

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

@@ -1,19 +1,26 @@
 package com.dragoninfo.dcuc.app.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.dragoninfo.dcuc.app.dto.ServiceResourceDTO;
+import com.dragoninfo.dcuc.app.entity.ApplyInfo;
 import com.dragoninfo.dcuc.app.entity.ServiceResource;
+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.dragonsoft.duceap.base.enums.BooleanEnum;
 import com.dragonsoft.duceap.core.search.Searchable;
 import com.dragonsoft.duceap.mybaitsplus.core.services.BaseMybatisService;
 import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageImpl;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
@@ -27,6 +34,9 @@ public class ServiceResourceServiceImpl extends BaseMybatisService<ServiceResour
 
     private final ServiceResourceMapper serviceResourceMapper;
 
+    @Autowired
+    private IApplyInfoFacade applyInfoFacade;
+
     public ServiceResourceServiceImpl(ServiceResourceMapper serviceResourceMapper) {
         super(serviceResourceMapper);
         this.serviceResourceMapper = serviceResourceMapper;
@@ -63,4 +73,35 @@ public class ServiceResourceServiceImpl extends BaseMybatisService<ServiceResour
         serviceResourceMapper.updateById(serviceResource);
         return true;
     }
+    /**
+     * 服务资源列表分页查询
+     * @return
+     */
+    @Override
+    public Page<ServiceResourceVo> page(Searchable searchable) {
+        Page<ServiceResource> serviceResources = serviceResourceMapper.pagingBySearchable(searchable);
+        List<ServiceResourceVo> result = new ArrayList<>();
+        if (CollectionUtils.isNotEmpty(serviceResources.getContent())){
+            for (ServiceResource serviceResource :serviceResources.getContent()){
+                ServiceResourceVo serviceResourceVo = new ServiceResourceVo();
+                BeanUtils.copyProperties(serviceResource, serviceResourceVo);
+                //设置应用名称
+                appendAppName(serviceResourceVo);
+                result.add(serviceResourceVo);
+            }
+        }
+        return new PageImpl<>(result, searchable.getPage(), serviceResources.getTotalElements());
+    }
+
+    /**
+     * 设置应用名称
+     * @param serviceResourceVo
+     */
+    private void appendAppName(ServiceResourceVo serviceResourceVo) {
+        ApplyInfo applyInfo = applyInfoFacade.getAppByCode(serviceResourceVo.getAppCode());
+        if(null != applyInfo){
+            serviceResourceVo.setAppName(applyInfo.getApplyName());
+        }
+
+    }
 }

dcuc-app-service/src/main/java/com/dragoninfo/dcuc/app/strategy/AppResourceStrategy.java

@@ -82,6 +82,10 @@ public class AppResourceStrategy implements ResourceOperateStrategy<AppResourceD
         applyInfo.setManufacturerId(dto.getContractUnitId());
         applyInfo.setRegistrationTime(dto.getRegistrationTime());
         applyInfo.setApplyStatus(dto.getAppStatus());
+        applyInfo.setAppOpsDepName(dto.getAppOpsDepName());
+        applyInfo.setManagerOrgCode(dto.getManagerOrgCode());
+        applyInfo.setLineTime(dto.getManagerOrgCode());
+        applyInfo.setAppEnglishName(dto.getManagerOrgCode());
         return applyInfo;
     }
 

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

@@ -12,8 +12,8 @@ dcuc:
       kafka: false
       app-topic: 10000028
       service-topic: 10000029
-#      bus-sra-id: Y-120000000000-0042
-      bus-sra-id: Y-120000000000-0037 # 测试使用
+      bus-sra-id: Y-120000000000-0042
+#      bus-sra-id: Y-120000000000-0037 # 测试使用
       bus-sre-idcard: 654001197503078495
       #应用资源请求参数
       page-size: 50

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

@@ -2,10 +2,10 @@ spring:
   profiles:
     active: default
   datasource:
-    username: jzpt_bu
-    password: dragon
+    username: dcuc
+    password: 123
     driver-class-name: com.mysql.jdbc.Driver
-    url: jdbc:mysql://192.168.120.142:3306/dcuc_2.0?useUnicode=true&characterEncoding=UTF-8&serverTimezone=UTC
+    url: jdbc:mysql://10.254.10.31:3306/dcuc_tjdsj_2.0?useUnicode=true&characterEncoding=UTF-8&serverTimezone=UTC
     druid:
       filters: sqlaudit
   application:

dcuc-app-service/src/main/resources/config/mysql/V4_1_0004__alert_column.sql

@@ -0,0 +1,13 @@
+ALTER TABLE `t_service_resource`
+ADD COLUMN `service_type`  varchar(20) NULL COMMENT '服务类型' AFTER `manager_unit_code`,
+ADD COLUMN `service_provide_way`  varchar(20) NULL COMMENT '服务提供方式' AFTER `service_type`,
+ADD COLUMN `must_self`  varchar(1) NULL COMMENT '是否自用服务' AFTER `service_provide_way`,
+ADD COLUMN `app_code`  varchar(100) NULL COMMENT '服务提供应用系统code' AFTER `must_self`;
+
+ALTER TABLE `t_apply_info`
+ADD COLUMN `app_ops_dep_name`  varchar(255) NULL COMMENT '应用系统运维单位名称' AFTER `manager_org_name`,
+ADD COLUMN `manager_org_code`  varchar(255) NULL COMMENT '应用系统事权单位代码' AFTER `app_ops_dep_name`;
+
+ALTER TABLE `t_apply_info`
+ADD COLUMN `app_english_name`  varchar(100) NULL COMMENT '应用英文名称' AFTER `manager_org_code`,
+ADD COLUMN `line_time`  varchar(100) NULL COMMENT '上线日期' AFTER `app_english_name`;

dcuc-app-service/src/main/resources/config/sql/V4_1_0005__ALERT_COLUMN_init.sql

@@ -0,0 +1,29 @@
+ALTER TABLE "T_SERVICE_RESOURCE"
+ADD ( "SERVICE_TYPE" VARCHAR2(20) NULL  ) 
+ADD ( "SERVICE_PROVIDE_WAY" VARCHAR2(20) NULL  ) 
+ADD ( "MUST_SELF" VARCHAR2(1) NULL  ) 
+ADD ( "APP_CODE" VARCHAR2(100) NULL  ) ;
+
+COMMENT ON COLUMN "T_SERVICE_RESOURCE"."SERVICE_TYPE" IS ''服务类型'';
+
+COMMENT ON COLUMN "T_SERVICE_RESOURCE"."SERVICE_PROVIDE_WAY" IS ''服务提供方式'';
+
+COMMENT ON COLUMN "T_SERVICE_RESOURCE"."MUST_SELF" IS ''是否自用服务'';
+
+COMMENT ON COLUMN "T_SERVICE_RESOURCE"."APP_CODE" IS ''服务提供应用系统code'';
+
+
+
+ALTER TABLE "T_APPLY_INFO"
+ADD ( "APP_OPS_DEP_NAME" VARCHAR2(255) NULL  )
+ADD ( "MANAGER_ORG_CODE" VARCHAR2(255) NULL  )
+ADD ( "APP_ENGLISH_NAME" VARCHAR2(100) NULL  )
+ADD ( "LINE_TIME" VARCHAR2(100) NULL  ) ;
+
+COMMENT ON COLUMN "T_APPLY_INFO"."APP_OPS_DEP_NAME" IS '应用系统运维单位名称';
+
+COMMENT ON COLUMN "T_APPLY_INFO"."MANAGER_ORG_CODE" IS '应用系统事权单位代码';
+
+COMMENT ON COLUMN "T_APPLY_INFO"."APP_ENGLISH_NAME" IS '应用英文名称';
+
+COMMENT ON COLUMN "T_APPLY_INFO"."LINE_TIME" IS '上线日期';