Merge branch 'develop' of 192.168.0.144:dcuc-tjdsj/auth-back into huangzqa-new-version-20210404

 Conflicts:

	src/main/java/com/dragoninfo/dcuc/authweb/restcontroller/api/authservice/v1/controller/AuthServiceController.java

src/main/java/com/dragoninfo/dcuc/authweb/restcontroller/api/authservice/v1/controller/AuthServiceController.java

@@ -155,9 +155,27 @@ public class AuthServiceController {
         content.forEach(item -> {
             ServiceAuthResultVo vo = new ServiceAuthResultVo();
             BeanUtils.copyProperties(item, vo);
+            vo.setServiceStatus(item.getAuthStatus());
+            vo.setPrivilegedTime(item.getCreateTime());
             voList.add(vo);
         });
         return ApiResult.setSuccessPage(serviceAuthResultDtoList.getTotalElements(), voList);
     }
 
+    @ApiOperation(value = "服务授权撤销")
+    @ApiImplicitParams({@ApiImplicitParam(name = "appCode", value = "应用编码"),
+            @ApiImplicitParam(name = "serviceCode", value = "服务编码")
+    })
+    @DeleteMapping("service/{appCode}/{serviceCode}")
+    public ApiResult delService(@PathVariable String appCode, @PathVariable String serviceCode)  {
+        try {
+            ServiceAuthResultDTO authDto = serviceAuthResultFacade.getDetailByAppAndService(appCode,serviceCode);
+            serviceAuthResultFacade.delServiceAuthResult(authDto.getId());
+            return ApiResult.setSuccess();
+        } catch (Exception e){
+            e.printStackTrace();
+            return ApiResult.setFailMessage("服务授权撤销失败");
+        }
+
+    }
 }

src/main/java/com/dragoninfo/dcuc/authweb/restcontroller/api/authservice/v1/vo/ServiceAuthResultVo.java

@@ -1,8 +1,11 @@
 package com.dragoninfo.dcuc.authweb.restcontroller.api.authservice.v1.vo;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.Date;
+
 /**
  * @Author yica
  * @Date 2021/3/10 15:22
@@ -23,5 +26,10 @@ public class ServiceAuthResultVo {
     @ApiModelProperty(value = "服务名称", required = true)
     private String serviceName;
 
+    @ApiModelProperty(value = "服务状态", required = true)
+    private String serviceStatus;
 
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "授权时间", required = true)
+    private Date privilegedTime;
 }

src/main/java/com/dragoninfo/dcuc/authweb/restcontroller/app/ResourceListingController.java

@@ -2,25 +2,16 @@ package com.dragoninfo.dcuc.authweb.restcontroller.app;
 
 import com.dragoninfo.dcuc.app.dto.ResourceRequestParamDTO;
 import com.dragoninfo.dcuc.app.dto.ResourceRequestResultDTO;
-import com.dragoninfo.dcuc.app.dto.ServiceResourceDTO;
 import com.dragoninfo.dcuc.app.facade.IResourceFacade;
 import com.dragoninfo.dcuc.authweb.restcontroller.app.vo.ResourceRequestParam;
 import com.dragoninfo.dcuc.authweb.restcontroller.app.vo.ResourceRequestResult;
-import com.dragoninfo.dcuc.authweb.restcontroller.app.vo.ServiceResourceVo;
 import com.dragoninfo.duceap.core.response.Result;
-import com.dragonsoft.duceap.core.entity.page.PageImpl;
-import com.dragonsoft.duceap.core.entity.page.PageRequest;
-import com.dragonsoft.duceap.core.search.Searchable;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.Pageable;
-import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -66,23 +57,4 @@ public class ResourceListingController {
         return Result.success();
     }
 
-    /**
-     * 服务资源列表分页查询
-     */
-    @ApiOperation(value = "查询应用列表")
-    @ApiImplicitParam(name = "searchable", value = "查询条件")
-    @PostMapping(value = "serviceResource/search", produces = MediaType.APPLICATION_JSON_VALUE)
-    public Result<Page<ServiceResourceVo>> serviceResourcePage(Searchable searchable) {
-        Page<ServiceResourceDTO> page = iResourceFacade.serviceResourcePage(searchable.toSearchDTO());
-        List<ServiceResourceVo> vos = new ArrayList<>();
-        List<ServiceResourceDTO> content = page.getContent();
-        for (ServiceResourceDTO dto : content) {
-            ServiceResourceVo vo = new ServiceResourceVo();
-            BeanUtils.copyProperties(dto, vo);
-            vos.add(vo);
-        }
-        Pageable newPageable = new PageRequest(page.getNumber(), page.getSize());
-        PageImpl<ServiceResourceVo> pageResult = new PageImpl<>(vos, newPageable, page.getTotalElements());
-        return Result.success(pageResult);
-    }
 }

src/main/java/com/dragoninfo/dcuc/authweb/restcontroller/audit/MgeAuditRptController.java

@@ -40,10 +40,10 @@ public class MgeAuditRptController {
 
     @ApiImplicitParam(name = "SearchDTO", value = "查询条件")
     @PostMapping(value = "audits")
-    public Result<List<UserMgeLogRptVo>> getMgeAuditRpt(SearchDTO searchDTO){
+    public Result<List<UserMgeLogRptVo>> getMgeAuditRpt(SearchDTO searchDTO) {
         searchDTO.setSort("");
         Searchable searchable = Searchable.toSearchable(searchDTO);
-        searchable.addSort(Sort.Direction.DESC,"operate_time");
+        searchable.addSort(Sort.Direction.DESC, "operate_time");
         Page<com.dragoninfo.dcuc.user.user.vo.UserMgeLogRptVo> userMgeLogSummary = iMgeLogFacade.findUserMgeLogSummary(searchDTO);
         List<UserMgeLogRptVo> vos = new ArrayList<>();
         for (com.dragoninfo.dcuc.user.user.vo.UserMgeLogRptVo userMgeLogRptVo : userMgeLogSummary) {
@@ -51,20 +51,20 @@ public class MgeAuditRptController {
             BeanUtils.copyProperties(userMgeLogRptVo, vo);
             vos.add(vo);
         }
-        Result result = Result.success(userMgeLogSummary.getTotalElements(),vos);
+        Result result = Result.success(userMgeLogSummary.getTotalElements(), vos);
         return result;
     }
 
     @ApiOperation(value = "查询管理员审计详情")
     @ApiImplicitParam(name = "id", value = "id")
     @GetMapping(value = "/detail/{id}")
-    public Result<MgeLogVo> orgAuditDetail(@PathVariable("id") String id){
+    public Result<MgeLogVo> orgAuditDetail(@PathVariable("id") String id) {
         MgeLog mgeLog = iMgeLogFacade.getMgeLog(id);
         List<MgeLog> mgeLogList = new ArrayList<MgeLog>();
         mgeLogList.add(mgeLog);
-        formatMgeLog(mgeLogList,"rpt");
+        formatMgeLog(mgeLogList, "rpt");
         MgeLogVo mgeLogVo = new MgeLogVo();
-        BeanUtils.copyProperties(mgeLog,mgeLogVo);
+        BeanUtils.copyProperties(mgeLog, mgeLogVo);
         return Result.success(mgeLogVo);
     }
 
@@ -89,11 +89,11 @@ public class MgeAuditRptController {
     @GetMapping(value = "auditList/{type}/{userId}")
     public Result<List<MgeLogVo>> auditList(@PathVariable("type") String type, @PathVariable("userId") String userId) {
         List<MgeLog> mgeLogList = iMgeLogFacade.queryList(type, userId);
-        mgeLogList = formatMgeLog(mgeLogList,"list");
+        mgeLogList = formatMgeLog(mgeLogList, "list");
         List<MgeLogVo> vos = new ArrayList<>();
         for (MgeLog mgeLog : mgeLogList) {
             MgeLogVo vo = new MgeLogVo();
-            BeanUtils.copyProperties(mgeLog,vo);
+            BeanUtils.copyProperties(mgeLog, vo);
             vos.add(vo);
         }
         return Result.success(vos);
@@ -101,22 +101,23 @@ public class MgeAuditRptController {
 
     /**
      * 格式化审计Log
+     *
      * @param mgeLogList
      * @return
      */
-    private List<MgeLog> formatMgeLog(List<MgeLog> mgeLogList,String listOrRpt){
-        for(MgeLog mgeLog : mgeLogList){
+    private List<MgeLog> formatMgeLog(List<MgeLog> mgeLogList, String listOrRpt) {
+        for (MgeLog mgeLog : mgeLogList) {
             String type = mgeLog.getObjectType();//操作对象类型
             String ids = mgeLog.getObjectId();
             ids = StringUtils.isEmpty(ids) ? "" : ids;
-            if (!AdminObjectTypeEnum.GLY.getValue().equals(type) && !AdminObjectTypeEnum.PTCD.getValue().equals(type)){
+            if (!AdminObjectTypeEnum.GLY.getValue().equals(type) && !AdminObjectTypeEnum.PTCD.getValue().equals(type)) {
                 if (AdminObjectTypeEnum.JGGL.getValue().equals(type) || AdminObjectTypeEnum.RYGL.getValue().equals(type) || AdminObjectTypeEnum.SQGL.getValue().equals(type) || AdminObjectTypeEnum.GLYGL.getValue().equals(type)) {
                     ids = iOrgInfoFacade.changeIdsToNames(ids);
                     ids = ids.replace(":-1", "（及其下属机构）").replace(":0", "").replace(":1", "").replace(":2", "（及其下属机构）");
                     mgeLog.setObjectName(ids);
                 }
 
-            }else if(type.equals(AdminObjectTypeEnum.PTCD.getValue())){
+            } else if (type.equals(AdminObjectTypeEnum.PTCD.getValue())) {
                 Map<String, MgeLog> resultMap = new TreeMap<String, MgeLog>(new Comparator<String>() {
                     @Override
                     public int compare(String o1, String o2) {
@@ -127,9 +128,9 @@ public class MgeAuditRptController {
                 mgeLogListTemp.add(mgeLog);
                 String s = JsonUtils.toJSONString(mgeLogListTemp);
                 Map<Object, Object> mgeLogMap = new HashMap<>();
-                mgeLogMap.put("mgeLogMap",s);
+                mgeLogMap.put("mgeLogMap", s);
                 mgeLogListTemp = iMenuMtAuthFacade.convertIdsToNames(mgeLogMap);
-                if(listOrRpt.equals("list")){
+                if (listOrRpt.equals("list")) {
                     mgeLog = mgeLogListTemp.get(0);
                     String key = mgeLog.getOperateTime().toString() + mgeLog.getOperateUserId();
                     if (resultMap.containsKey(key)) {
@@ -145,8 +146,8 @@ public class MgeAuditRptController {
                         mgeLogListTemp.add(entry.getValue());
                     }
                     mgeLog = mgeLogListTemp.get(0);
-                }else{
-                    if(CollectionUtils.isNotEmpty(mgeLogListTemp)){
+                } else {
+                    if (CollectionUtils.isNotEmpty(mgeLogListTemp)) {
                         mgeLog.setObjectName(mgeLogListTemp.get(0).getObjectName());
                     }
                 }

src/main/java/com/dragoninfo/dcuc/authweb/restcontroller/login/DcucLoginController.java

@@ -78,7 +78,7 @@ public class DcucLoginController {
             securityUser.setSecurityOrg(rootOrgid);
             return securityUser;
         } catch (Exception var3) {
-            logger.error("获取用户信息异常", var3.getMessage());
+            logger.error("获取用户信息异常", var3);
             throw new SecurityException("获取用户信息异常", var3);
         }
     }