feature(添加注释): 添加注释

添加注释

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

@@ -4,22 +4,56 @@ import lombok.Data;
 
 import java.io.Serializable;
 import java.util.Date;
+import java.util.List;
 
 /**
+ * 应用资源DTO
  * @author mazq
  * @Description
  * @create 2020-11-25 14:21
  */
 @Data
 public class AppResourceDTO extends ResourceDTO implements Serializable {
+    /**
+     * 应用编码
+     */
     private String appCode;
+
+    /**
+     * 应用名称
+     */
     private String appName;
+
+    /**
+     * 应用访问地址
+     */
     private String appUrl;
+
+    /**
+     * 应用状态
+     */
     private String appStatus;
+
+    /**
+     * 应用类别
+     */
     private String applyCategory;
+
+    /**
+     * 所属警种类别
+     */
     private String policeSpecies;
+
+    /**
+     * 注册时间
+     */
     private Date registrationTime;
 
+    /**
+     * 应用关联菜单DTOs
+     */
+    private List<MenuResourceDTO> menusResources;
+
     public AppResourceDTO() {
         super();
     }

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

@@ -0,0 +1,18 @@
+package com.dragoninfo.dcuc.app.dto;
+
+import lombok.Data;
+
+/**
+ * @author mazq
+ * @date 2021/2/18
+ */
+@Data
+public class MenuResourceDTO {
+    private String id;
+    private String appId;
+    private String funCode;
+    private String pFunCode;
+    private String funName;
+    private String status;
+    private String appCode;
+}

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

@@ -6,6 +6,7 @@ import java.io.Serializable;
 import java.util.Date;
 
 /**
+ * 应用/服务资源父类DTO
  * @author mazq
  * @Description
  * @create 2020-11-25 14:21
@@ -13,21 +14,85 @@ import java.util.Date;
 @Data
 public class ResourceDTO implements Serializable {
     private String id;
+
+    /**
+     * 资源枚举类-资源id
+     */
     private String resourceId;
+
+    /**
+     * 资源枚举类-资源类型
+     */
     private String resourceType;
+
+    /**
+     * 资源枚举类-资源提供方
+     */
     private String resourceProvider;
+
+    /**
+     * 建设单位id（orgId）
+     */
     private String buildUnitId;
+
+    /**
+     * 建设单位编码（orgCode）
+     */
     private String buildUnitCode;
+
+    /**
+     * 建设单位名称
+     */
     private String buildUnit;
+
+    /**
+     * 建设单位负责人
+     */
     private String buildPrincipal;
+
+    /**
+     * 建设单位负责人电话
+     */
     private String buildPrincipalPhone;
+
+    /**
+     * 承建单位id（ManufacturerId）
+     */
     private String contractUnitId;
+
+    /**
+     * 承建单位编码（ManufacturerCode）
+     */
     private String contractUnitCode;
+
+    /**
+     * 承建单位名称
+     */
     private String contractUnit;
+
+    /**
+     * 承建单位负责人
+     */
     private String contractPrincipal;
+
+    /**
+     * 承建单位负责人电话
+     */
     private String contractPrincipalPhone;
+
+    /**
+     * 是否删除
+     */
     private String deleted;
+
+    /**
+     * 创建时间
+     */
     private Date createTime;
+
+    /**
+     * 更新时间
+     */
     private Date updateTime;
 
     public ResourceDTO(String resourceId, String resourceType, String resourceProvider) {

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

@@ -6,6 +6,7 @@ import java.io.Serializable;
 import java.util.Date;
 
 /**
+ * 应用服务资源同步DTO
  * @author mazq
  * @Description
  * @create 2020-11-25 14:21
@@ -15,30 +16,69 @@ public class ResourceSyncDTO implements Serializable {
 
     private String id;
 
+    /**
+     * 外部Id
+     */
     private String extId;
 
+    /**
+     * 内容（Json格式）
+     */
     private String content;
 
+    /**
+     * 资源枚举类-资源id
+     */
     private String resourceId;
 
+    /**
+     * 资源枚举类-资源类型
+     */
     private String resourceType;
 
+    /**
+     * 资源枚举类-资源提供方
+     */
     private String resourceProvider;
 
+    /**
+     * 服务资源编码
+     */
     private String serviceCode;
 
+    /**
+     * 服务资源名称
+     */
     private String serviceName;
 
+    /**
+     * 应用资源编码
+     */
     private String appCode;
 
+    /**
+     * 应用资源名称
+     */
     private String appName;
 
+    /**
+     * 创建时间
+     */
     private Date createTime;
 
+    /**
+     * 更新时间
+     */
     private Date updateTime;
 
+    /**
+     * 是否删除
+     */
     private String deleted;
 
+    /**
+     * 是否同步
+     */
     private String sync;
 
     public ResourceSyncDTO() {

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

@@ -1,157 +1,98 @@
 package com.dragoninfo.dcuc.app.dto;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
 
 /**
+ * 服务授权工作单DTO
  * @author mazq
  * @Description
  * @create 2020-11-25 14:21
  */
+@Data
 public class ServiceAuthFlowDTO implements Serializable {
 
     private String id;
-    private String applicantIdcard;
-    private String applicantName;
-    private String applicantOrgCode;
-    private String applicantOrgName;
-    private String approvalIdcard;
-    private String approvalName;
-    private String approvalOrgCode;
-    private String approvalOrgName;
-    private String appCode;
-    private String appName;
-    private String serviceAuthStatus;
-    private String orderNo;
-    private Date applyTime;
-    private String serviceCodes;
-    private String serviceNames;
-
-    public String getId() {
-        return id;
-    }
-
-    public void setId(String id) {
-        this.id = id;
-    }
-
-    public String getAppCode() {
-        return appCode;
-    }
-
-    public void setAppCode(String appCode) {
-        this.appCode = appCode;
-    }
-
-    public String getServiceAuthStatus() {
-        return serviceAuthStatus;
-    }
-
-    public void setServiceAuthStatus(String serviceAuthStatus) {
-        this.serviceAuthStatus = serviceAuthStatus;
-    }
-
-    public String getApplicantName() {
-        return applicantName;
-    }
-
-    public void setApplicantName(String applicantName) {
-        this.applicantName = applicantName;
-    }
 
-    public String getApplicantOrgName() {
-        return applicantOrgName;
-    }
-
-    public void setApplicantOrgName(String applicantOrgName) {
-        this.applicantOrgName = applicantOrgName;
-    }
-
-    public String getApplicantOrgCode() {
-        return applicantOrgCode;
-    }
-
-    public void setApplicantOrgCode(String applicantOrgCode) {
-        this.applicantOrgCode = applicantOrgCode;
-    }
-
-    public String getApplicantIdcard() {
-        return applicantIdcard;
-    }
-
-    public void setApplicantIdcard(String applicantIdcard) {
-        this.applicantIdcard = applicantIdcard;
-    }
-
-    public String getApprovalIdcard() {
-        return approvalIdcard;
-    }
-
-    public void setApprovalIdcard(String approvalIdcard) {
-        this.approvalIdcard = approvalIdcard;
-    }
-
-    public String getApprovalOrgCode() {
-        return approvalOrgCode;
-    }
+    /**
+     * 申请人身份证号
+     */
+    private String applicantIdcard;
 
-    public void setApprovalOrgCode(String approvalOrgCode) {
-        this.approvalOrgCode = approvalOrgCode;
-    }
+    /**
+     * 申请人姓名
+     */
+    private String applicantName;
 
-    public String getAppName() {
-        return appName;
-    }
+    /**
+     * 申请机构code
+     */
+    private String applicantOrgCode;
 
-    public void setAppName(String appName) {
-        this.appName = appName;
-    }
+    /**
+     * 申请机构名称
+     */
+    private String applicantOrgName;
 
-    public String getOrderNo() {
-        return orderNo;
-    }
+    /**
+     * 审批人身份证号
+     */
+    private String approvalIdcard;
 
-    public void setOrderNo(String orderNo) {
-        this.orderNo = orderNo;
-    }
+    /**
+     * 审批人姓名
+     */
+    private String approvalName;
 
-    public Date getApplyTime() {
-        return applyTime;
-    }
+    /**
+     * 审批机构code
+     */
+    private String approvalOrgCode;
 
-    public void setApplyTime(Date applyTime) {
-        this.applyTime = applyTime;
-    }
+    /**
+     * 审批机构code
+     */
+    private String approvalOrgName;
 
-    public String getServiceCodes() {
-        return serviceCodes;
-    }
+    /**
+     * 应用代码
+     */
+    private String appCode;
 
-    public void setServiceCodes(String serviceCodes) {
-        this.serviceCodes = serviceCodes;
-    }
+    /**
+     * 应用名称
+     */
+    private String appName;
 
-    public String getServiceNames() {
-        return serviceNames;
-    }
+    /**
+     * 服务授权工作单状态
+     */
+    private String serviceAuthStatus;
 
-    public void setServiceNames(String serviceNames) {
-        this.serviceNames = serviceNames;
-    }
+    /**
+     * 工单号
+     */
+    private String orderNo;
 
-    public String getApprovalName() {
-        return approvalName;
-    }
+    /**
+     * 申请时间
+     */
+    private Date applyTime;
 
-    public void setApprovalName(String approvalName) {
-        this.approvalName = approvalName;
-    }
+    /**
+     * 服务资源codes （多个服务使用',' 隔开）
+     */
+    private String serviceCodes;
 
-    public String getApprovalOrgName() {
-        return approvalOrgName;
-    }
+    /**
+     * 服务资源名称 （多个服务使用',' 隔开）
+     */
+    private String serviceNames;
 
-    public void setApprovalOrgName(String approvalOrgName) {
-        this.approvalOrgName = approvalOrgName;
-    }
+    /**
+     * 是否删除
+     */
+    private String deleted;
 }

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

@@ -5,16 +5,37 @@ import lombok.Data;
 import java.io.Serializable;
 
 /**
+ * 服务资源DTO
  * @author mazq
  * @Description
  * @create 2020-11-25 14:21
  */
 @Data
 public class ServiceResourceDTO extends ResourceDTO implements Serializable {
+
+    /**
+     * 服务编码
+     */
     private String serviceCode;
+
+    /**
+     * 服务名称
+     */
     private String serviceName;
+
+    /**
+     * 服务使用状态
+     */
     private String serviceStatus;
+
+    /**
+     * 服务访问地址
+     */
     private String serviceUrl;
+
+    /**
+     * 服务提供方式 01服务总线，02Api网关，03服务接口
+     */
     private String provideMode;
 
     public ServiceResourceDTO() {

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

@@ -9,7 +9,12 @@ import lombok.Data;
 import java.io.Serializable;
 import java.util.Date;
 
-
+/**
+ * 资源同步entity
+ * @author mazq
+ * @Description
+ * @create 2020-11-25
+ */
 @Data
 @TableName("T_RESOURCE_SYNC")
 public class ResourceSync implements Serializable {
@@ -17,30 +22,70 @@ public class ResourceSync implements Serializable {
     @TableId(type = IdType.UUID)
     private String id;
 
+    /**
+     * 外部Id
+     */
+    private String extId;
+
+    /**
+     * 内容（Json格式）
+     */
     private String content;
 
-    private String extId;
+    /**
+     * 资源枚举类-资源id
+     */
+    private String resourceId;
+
+    /**
+     * 资源枚举类-资源类型
+     */
+    private String resourceType;
 
+    /**
+     * 资源枚举类-资源提供方
+     */
+    private String resourceProvider;
+
+    /**
+     * 服务资源编码
+     */
     private String serviceCode;
 
+    /**
+     * 服务资源名称
+     */
     private String serviceName;
 
+    /**
+     * 应用资源编码
+     */
     private String appCode;
 
+    /**
+     * 应用资源名称
+     */
     private String appName;
 
-    private String resourceId;
-
-    private String resourceType;
-
+    /**
+     * 创建时间
+     */
     private Date createTime;
 
+    /**
+     * 更新时间
+     */
     private Date updateTime;
 
+    /**
+     * 资源是否同步
+     */
     private String sync;
 
+    /**
+     * 是否删除
+     */
     @TableLogic
     private String deleted;
 
-    private String resourceProvider;
 }

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

@@ -4,16 +4,16 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.dragonsoft.duceap.base.entity.persistent.IdEntity;
 import lombok.Data;
 
 import java.io.Serializable;
 import java.util.Date;
 
 /**
+ * 服务授权工单entity
  * @author mazq
  * @Description
- * @create 2020-11-25 14:31
+ * @create 2020-11-25
  */
 @Data
 @TableName("T_SERVICE_AUTH_FLOW")
@@ -22,40 +22,95 @@ public class ServiceAuthFlow implements Serializable {
     @TableId(type = IdType.UUID)
     private String id;
 
-    private String applicantName;
 
+    /**
+     * 申请人身份证号
+     */
     private String applicantIdcard;
 
+    /**
+     * 申请人姓名
+     */
+    private String applicantName;
+
+    /**
+     * 申请机构code
+     */
     private String applicantOrgCode;
 
+    /**
+     * 申请机构名称
+     */
     private String applicantOrgName;
 
+    /**
+     * 审批人身份证号
+     */
     private String approvalIdcard;
 
+    /**
+     * 审批人姓名
+     */
     private String approvalName;
 
+    /**
+     * 审批机构code
+     */
     private String approvalOrgCode;
 
+    /**
+     * 审批机构code
+     */
     private String approvalOrgName;
 
+    /**
+     * 应用代码
+     */
     private String appCode;
 
+    /**
+     * 应用名称
+     */
     private String appName;
 
+    /**
+     * 服务授权工作单状态
+     */
     private String serviceAuthStatus;
 
+    /**
+     * 工单号
+     */
     private String orderNo;
 
+    /**
+     * 申请时间
+     */
     private Date applyTime;
 
+    /**
+     * 服务资源codes （多个服务使用',' 隔开）
+     */
     private String serviceCodes;
 
+    /**
+     * 服务资源名称 （多个服务使用',' 隔开）
+     */
     private String serviceNames;
 
+    /**
+     * 创建时间
+     */
     private Date createTime;
 
+    /**
+     * 更新时间
+     */
     private Date updateTime;
 
+    /**
+     * 是否删除
+     */
     @TableLogic
     private String deleted;
 }

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

@@ -5,11 +5,11 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
-
 import java.io.Serializable;
 import java.util.Date;
 
 /**
+ * 服务授权结果entity
  * @author mazq
  * @date 2020/11/26
  */
@@ -20,18 +20,39 @@ public class ServiceAuthResult implements Serializable {
     @TableId(type = IdType.UUID)
     private String id;
 
+    /**
+     * 应用编码
+     */
     private String appCode;
 
+    /**
+     * 应用id
+     */
     private String appId;
 
+    /**
+     * 服务编码
+     */
     private String serviceCode;
 
+    /**
+     * 服务id
+     */
     private String serviceId;
 
+    /**
+     * 创建时间
+     */
     private Date createTime;
 
+    /**
+     * 更新时间
+     */
     private Date updateTime;
 
+    /**
+     * 是否删除
+     */
     @TableLogic
     private String deleted;
 }

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

@@ -10,55 +10,122 @@ import lombok.Data;
 import java.io.Serializable;
 import java.util.Date;
 
-
+/**
+ * 服务资源entity
+ * @author mazq
+ * @Description
+ * @create 2020-11-25
+ */
 @TableName("T_SERVICE_RESOURCE")
 @Data
 public class ServiceResource implements Serializable {
     @TableId(type = IdType.UUID)
     private String id;
 
+    /**
+     * 资源枚举类-资源id
+     */
     private String resourceId;
 
+    /**
+     * 资源枚举类-资源类型
+     */
     private String resourceType;
 
+    /**
+     * 资源枚举类-资源提供方
+     */
     private String resourceProvider;
 
+    /**
+     * 服务编码
+     */
     private String serviceCode;
 
+    /**
+     * 服务名称
+     */
     private String serviceName;
 
+    /**
+     * 服务使用状态
+     */
+    private String serviceStatus;
+
+    /**
+     * 服务访问地址
+     */
     private String serviceUrl;
 
+    /**
+     * 服务提供方式 01服务总线，02Api网关，03服务接口
+     */
     private String provideMode;
 
+    /**
+     * 建设单位id（orgId）
+     */
     private String buildUnitId;
 
+    /**
+     * 建设单位编码（orgCode）
+     */
     private String buildUnitCode;
 
+    /**
+     * 建设单位名称
+     */
     private String buildUnit;
 
+    /**
+     * 建设单位负责人
+     */
     private String buildPrincipal;
 
+    /**
+     * 建设单位负责人电话
+     */
     private String buildPrincipalPhone;
 
+    /**
+     * 承建单位id（ManufacturerId）
+     */
     private String contractUnitId;
 
+    /**
+     * 承建单位编码（ManufacturerCode）
+     */
     private String contractUnitCode;
 
+    /**
+     * 承建单位名称
+     */
     private String contractUnit;
 
+    /**
+     * 承建单位负责人
+     */
     private String contractPrincipal;
 
+    /**
+     * 承建单位负责人电话
+     */
     private String contractPrincipalPhone;
 
+    /**
+     * 是否删除
+     */
     @TableLogic
     private String deleted;
 
+    /**
+     * 创建时间
+     */
     private Date createTime;
 
+    /**
+     * 更新时间
+     */
     private Date updateTime;
 
-    private String serviceStatus;
-
-
 }

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

@@ -9,17 +9,37 @@ import org.springframework.data.domain.Page;
 import java.util.List;
 
 /**
+ * 审批工单service
  * @author mazq
  * @Description
  * @create 2020-11-25 14:21
  */
 public interface IAuthFlowService {
 
+    /**
+     * 保存服务授权工单
+     * @param dto 工单DTO
+     * @return
+     */
     ServiceAuthFlow serviceAuthFlowSave(ServiceAuthFlowDTO dto);
 
+    /**
+     * 更新服务授权工单
+     * @param serviceAuthFlow 工单entity
+     */
     void update(ServiceAuthFlow serviceAuthFlow);
 
+    /**
+     * 分页查询工单
+     * @param searchable
+     * @return
+     */
     Page<ServiceAuthFlowDTO> page(Searchable searchable);
 
+    /**
+     * 根据工单号查询工单
+     * @param orderNo 工单号
+     * @return
+     */
     ServiceAuthFlow getByOrderNo(String orderNo);
 }

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

@@ -94,4 +94,10 @@ public interface IManufacturerInfoService extends IBaseService<ManufacturerInfo,
      */
     Map<String, String> getAllIdNameMap();
 
+    /**
+     * 根据code获取所有厂商
+     * @param list 厂商代码集合
+     * @return
+     */
+    List<ManufacturerInfo> getByCodes(List<String> list);
 }

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

@@ -12,24 +12,60 @@ import org.springframework.data.domain.Page;
 import java.util.List;
 
 /**
+ * 资源服务Service
  * @author mazq
  * @Description
  * @create 2020-11-25 14:21
  */
 public interface IResourceService {
 
+    /**
+     * 分页查询服务资源
+     * @param searchable
+     * @return
+     */
     Page<ServiceResourceDTO> page(Searchable searchable);
 
+    /**
+     * 保存应用资源
+     * @param dto 应用资源DTO
+     * @return
+     */
     ApplyInfo insertAppResource(AppResourceDTO dto);
 
+    /**
+     * 保存服务资源
+     * @param dto 服务资源DTO
+     * @return
+     */
     ServiceResource insertServiceResource(ServiceResourceDTO dto);
 
+    /**
+     * 批量保存应用资源
+     * @param list 应用资源DTOs
+     * @return
+     */
     List<ApplyInfo> batchInsertAppResource(List<AppResourceDTO> list);
 
+    /**
+     * 批量保存服务资源
+     * @param list 服务资源DTOs
+     * @return
+     */
     List<ServiceResource> batchInsertServiceResource(List<ServiceResourceDTO> list);
 
+    /**
+     * 通过serviceCode获取服务资源
+     * @param list -serviceCodes
+     * @return
+     */
     List<ServiceResource> getServiceByServiceCodes(List<String> list);
 
+    /**
+     * 从资源同步表将应用和服务数据同步到应用表和服务资源表
+     * @param resourceSyncs 资源同步数据集合
+     * @return
+     */
     boolean resourceSync(List<ResourceSync> resourceSyncs);
 
 }

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

@@ -3,21 +3,38 @@ package com.dragoninfo.dcuc.app.service;
 
 import com.dragoninfo.dcuc.app.dto.ResourceSyncDTO;
 import com.dragoninfo.dcuc.app.entity.ResourceSync;
-import com.dragonsoft.duceap.core.search.Searchable;
 
 import java.util.List;
 
 /**
+ * 资源同步Service
  * @author mazq
  * @date 2020/11/26
  */
 public interface IResourceSyncService {
 
+    /**
+     * 保存同步资源数据
+     * @param dto
+     * @return
+     */
     ResourceSync insertRemoteResourceSync(ResourceSyncDTO dto);
 
+    /**
+     * 更新同步资源数据
+     * @param resourceSync
+     */
     void update(ResourceSync resourceSync);
 
+    /**
+     * 批量更新同步资源数据
+     * @param resourceSyncs
+     */
     void batchUpdate(List<ResourceSync> resourceSyncs);
 
+    /**
+     * 获取还未进行同步的同步资源数据
+     * @return
+     */
     List<ResourceSync> getNotSyncResource();
 }

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

@@ -3,20 +3,24 @@ package com.dragoninfo.dcuc.app.service;
 
 import com.dragoninfo.dcuc.app.entity.ServiceAuthFlow;
 import com.dragoninfo.dcuc.app.entity.ServiceAuthResult;
-
 import java.util.List;
 
 /**
+ * 服务授权结果service
  * @author mazq
  * @date 2020/11/26
  */
 public interface IServiceAuthResultService {
 
+    /**
+     * 保存授权结果
+     * @param serviceAuthResult
+     * @return
+     */
     ServiceAuthResult saveAuthResult(ServiceAuthResult serviceAuthResult);
 
     /**
-     * 查下全部
-     *
+     * 查询全部
      * @return List<ServiceAuthResult>
      */
     List<ServiceAuthResult> findAuthResultAll();
@@ -28,7 +32,19 @@ public interface IServiceAuthResultService {
      */
     int findAuthResultAllSize();
 
+    /**
+     * 根据工单内容新增或删除服务授权结果
+     * @param value
+     * @param dto
+     * @return
+     */
     boolean approveService(String value, ServiceAuthFlow dto);
 
+    /**
+     * 根据appCode和serviceCode查询授权结果
+     * @param appCode 应用编码
+     * @param serviceCode 服务编码
+     * @return
+     */
     ServiceAuthResult getByAppServiceCode(String appCode, String serviceCode);
 }

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

@@ -139,6 +139,14 @@ public class ManufacturerInfoServiceImpl extends BaseMybatisService<Manufacturer
                 .collect(Collectors.toMap(ManufacturerInfo::getId, ManufacturerInfo::getManufacturerName));
     }
 
+    @Override
+    public List<ManufacturerInfo> getByCodes(List<String> list) {
+        LambdaQueryWrapper<ManufacturerInfo> queryWrapper = Wrappers.lambdaQuery();
+        queryWrapper.select()
+                    .in(ManufacturerInfo::getCode);
+        return manufacturerInfoMapper.selectList(queryWrapper);
+    }
+
     private void sendMessage(String content, ManufacturerInfo manufacturerInfo, ManufacturerMsgTypeEnum manufacturerMsgTypeEnum) {
 
         ManufacturerEventDTO manufacturerEventDTO = new ManufacturerEventDTO();

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

@@ -4,6 +4,8 @@ package com.dragoninfo.dcuc.app.service.impl;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 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.dto.AppResourceDTO;
 import com.dragoninfo.dcuc.app.dto.MenuResourceDTO;
 import com.dragoninfo.dcuc.app.dto.ResourceDTO;
@@ -25,9 +27,8 @@ import com.dragonsoft.duceap.base.exception.ApplicationException;
 import com.dragonsoft.duceap.core.entity.page.PageImpl;
 import com.dragonsoft.duceap.core.entity.page.PageRequest;
 import com.dragonsoft.duceap.core.search.Searchable;
-import com.dragonsoft.duceap.core.search.enums.SearchOperator;
 import com.dragonsoft.duceap.mybaitsplus.core.services.BaseMybatisService;
-import org.apache.commons.collections.map.HashedMap;
+import org.apache.commons.collections.CollectionUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
@@ -84,7 +85,11 @@ public class ResourceServiceImpl extends BaseMybatisService<ServiceResource,Stri
 
     @Override
     public ApplyInfo insertAppResource(AppResourceDTO dto) {
-        return (ApplyInfo) insertResource(dto);
+        ApplyInfo applyInfo = (ApplyInfo) insertResource(dto);
+        Map<String,String> map = new HashMap<>();
+        map.put(applyInfo.getApplyCode(),applyInfo.getId());
+        batchInsertMenu(dto.getMenusResources(),map);
+        return applyInfo;
     }
 
     @Override
@@ -101,6 +106,12 @@ public class ResourceServiceImpl extends BaseMybatisService<ServiceResource,Stri
             ApplyInfo applyInfo = (ApplyInfo) object;
             apps.add(applyInfo);
         }
+        List<MenuResourceDTO> menuDTOList = list.stream()
+                .map(AppResourceDTO::getMenusResources)
+                .flatMap(List::stream)
+                .collect(Collectors.toList());
+        Map<String, String> codeToIdMap = apps.stream().collect(Collectors.toMap(item -> item.getApplyCode(), item -> item.getId()));
+        batchInsertMenu(menuDTOList,codeToIdMap);
         return apps;
     }
 
@@ -125,6 +136,12 @@ public class ResourceServiceImpl extends BaseMybatisService<ServiceResource,Stri
         return objects;
     }
 
+    /**
+     * 根据对方提供机构编码,承建单位编码,批量获取orgId和manufacturerId
+     * @param list
+     * @param <T> ResourceDTO
+     * @return
+     */
     private <T extends ResourceDTO> List<T> setOrgIdsAndManIds(List<T> list) {
         //根据对方提供机构编码,承建单位编码,批量获取orgId和manufacturerId
         List<String> unitCodes = new ArrayList<>();
@@ -134,7 +151,7 @@ public class ResourceServiceImpl extends BaseMybatisService<ServiceResource,Stri
             unitCodes.add(unitCode);
             orgCodes.add(resourceDTO.getBuildUnitCode());
         }
-        Map<String, String> orgIds = getOrgorgIds(orgCodes);
+        Map<String, String> orgIds = getOrgIds(orgCodes);
         Map<String, String> manufacturerIds = getManufacturerIds(unitCodes);
         for (ResourceDTO dto : list) {
             String orgId = orgIds.get(dto.getBuildUnitCode());
@@ -146,30 +163,21 @@ public class ResourceServiceImpl extends BaseMybatisService<ServiceResource,Stri
     }
 
     private Map<String, String> getManufacturerIds(List<String> list) {
-        Map<String, String> codeMaps = new HashedMap();
-        Searchable searchable = Searchable.newSearchable();
-        searchable.addSearchFilter("code", SearchOperator.in, list);
-        List<ManufacturerInfo> manufacturerInfos = manufacturerInfoService.findAll(searchable);
-        for (ManufacturerInfo info : manufacturerInfos) {
-            codeMaps.put(info.getCode(), info.getId());
-        }
-        return codeMaps;
+        List<ManufacturerInfo> manufacturerInfos = manufacturerInfoService.getByCodes(list);
+        return manufacturerInfos.stream().collect(Collectors.toMap(ManufacturerInfo::getCode, ManufacturerInfo::getId));
     }
 
-    private Map<String, String> getOrgorgIds(List<String> list) {
-        Map<String, String> codeMaps = new HashMap<>();
-        Searchable searchable = Searchable.newSearchable();
-        searchable.addSearchFilter("code", SearchOperator.in, list);
-        List<OrgInfo> orgInfos = orgInfoFacade.findDeletedOrg(searchable.toSearchDTO());
-        for (OrgInfo info : orgInfos) {
-            codeMaps.put(info.getCode(), info.getId());
-        }
-        return codeMaps;
+    private Map<String, String> getOrgIds(List<String> list) {
+        List<OrgInfo> orgInfos = orgInfoFacade.getOrgsByCodes(list);
+        return orgInfos.stream().collect(Collectors.toMap(OrgInfo::getCode, OrgInfo::getId));
     }
 
     @Override
     public List<ServiceResource> getServiceByServiceCodes(List<String> list) {
-        return null;
+        LambdaQueryWrapper<ServiceResource> query = Wrappers.lambdaQuery();
+        query.select()
+             .in(ServiceResource::getServiceCode,list);
+        return serviceResourceMapper.selectList(query);
     }
 
     @Override
@@ -194,6 +202,11 @@ public class ResourceServiceImpl extends BaseMybatisService<ServiceResource,Stri
         return true;
     }
 
+    /**
+     * 批量插入应用的菜单数据
+     * @param menus MenuResourceDTO 菜单DTOs
+     * @param codeToIdMap appCode-appId 键值对Map
+     */
     private void batchInsertMenu(List<MenuResourceDTO> menus, Map<String, String> codeToIdMap) {
         List<AppFunInfo> funList = new ArrayList<>();
         for (MenuResourceDTO dto : menus) {
@@ -207,9 +220,16 @@ public class ResourceServiceImpl extends BaseMybatisService<ServiceResource,Stri
             }
             funList.add(appFunInfo);
         }
-        iAppFunInfoFacade.batchSave(funList);
+        if(CollectionUtils.isNotEmpty(funList)){
+            iAppFunInfoFacade.batchSave(funList);
+        }
     }
 
+    /**
+     * 将资源同步对象转为菜单DTO
+     * @param resourceSync ResourceSync 资源同步数据
+     * @return
+     */
     private List<MenuResourceDTO> getMenuResourceDTOs(ResourceSync resourceSync) {
         List<MenuResourceDTO> list = new ArrayList<>();
         String content = resourceSync.getContent();
@@ -227,6 +247,11 @@ public class ResourceServiceImpl extends BaseMybatisService<ServiceResource,Stri
         return list;
     }
 
+    /**
+     * 将资源同步对象转为服务资源DTO
+     * @param resourceSync ResourceSync 资源同步数据
+     * @return
+     */
     private ServiceResourceDTO getServiceResourceDTO(ResourceSync resourceSync) {
         String content = resourceSync.getContent();
         JSONObject ctj = JSON.parseObject(content);
@@ -244,6 +269,11 @@ public class ResourceServiceImpl extends BaseMybatisService<ServiceResource,Stri
         return dto;
     }
 
+    /**
+     * 将资源同步对象转为应用资源DTO
+     * @param resourceSync ResourceSync 资源同步数据
+     * @return
+     */
     private AppResourceDTO getAppResourceDTO(ResourceSync resourceSync) {
         String content = resourceSync.getContent();
         AppResourceDTO dto = new AppResourceDTO();
@@ -275,7 +305,7 @@ public class ResourceServiceImpl extends BaseMybatisService<ServiceResource,Stri
 
     /**
      * 保存应用、服务资源
-     * @param <T>
+     * @param <T> ResourceDTO
      * @param
      * @return
      */
@@ -286,6 +316,12 @@ public class ResourceServiceImpl extends BaseMybatisService<ServiceResource,Stri
         return resource;
     }
 
+    /**
+     * 根据对方提供机构编码,承建单位编码,获取orgId和manufacturerId
+     * @param dto ResourceDTO的子类
+     * @param <T>
+     * @return
+     */
     private <T extends ResourceDTO> T setOrgIdAndManId(T dto) {
         String buildUnitCode = dto.getBuildUnitCode();
         String contractUnitCode = dto.getContractUnitCode();
@@ -304,6 +340,11 @@ public class ResourceServiceImpl extends BaseMybatisService<ServiceResource,Stri
         return dto;
     }
 
+    /**
+     * 根据各自的策略保存资源数据
+     * @param dto ResourceDTO
+     * @return
+     */
     private Object doInsert(ResourceDTO dto) {
         Object obj;
         String resourceType = dto.getResourceId();

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

@@ -88,13 +88,7 @@ public class ServiceAuthResultServiceImpl extends BaseMybatisService<ServiceAuth
     }
 
     @Override
-    public boolean approveService(String operate, ServiceAuthFlow dto) {
-        doApprove(operate,dto);
-        return true;
-    }
-
-
-    private void doApprove(String operate, ServiceAuthFlow serviceAuthFlow) {
+    public boolean approveService(String operate, ServiceAuthFlow serviceAuthFlow) {
         String[] serviceCodeArr = serviceAuthFlow.getServiceCodes().split(",");
         List<String> list = Arrays.asList(serviceCodeArr);
         List<ServiceResource> resources = resourceService.getServiceByServiceCodes(list);
@@ -120,5 +114,6 @@ public class ServiceAuthResultServiceImpl extends BaseMybatisService<ServiceAuth
             //撤销权限工作单
             //删除权限
         }
+        return true;
     }
 }