feature: 任务类型同步、详情查询修改

pom.xml

@@ -110,14 +110,10 @@
         <dependency>
             <groupId>com.dragoninfo</groupId>
             <artifactId>dcuc-common</artifactId>
-            <version>2.0.1-SNAPSHOT</version>
-            <exclusions>
-                <exclusion>
-                    <artifactId>spring-jdbc</artifactId>
-                    <groupId>org.springframework</groupId>
-                </exclusion>
-            </exclusions>
+            <version>2.1.0-tjdsj-SNAPSHOT</version>
+            <scope>compile</scope>
         </dependency>
+
         <dependency>
             <groupId>com.dragoninfo</groupId>
             <artifactId>dcuc-auth-api</artifactId>

src/main/java/com/dragoninfo/dcuc/authweb/restcontroller/auth/vo/RoleInfoVo.java

@@ -79,7 +79,7 @@ public class RoleInfoVo {
     @ApiModelProperty(value = "角色类型")
     private String roleType;
 
-    @ApiModelProperty(value = "361标准角色类型字段")
+    @ApiModelProperty(value = "361标准角色关键状态字段")
     private String roleCategory;
 
     @ApiModelProperty(value = "人脸认证标识")

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

@@ -1,19 +1,20 @@
 package com.dragoninfo.dcuc.authweb.restcontroller.login;
 
 
+import com.dragoninfo.dcuc.auth.admin.facade.IManageInfoFacade;
 import com.dragoninfo.dcuc.auth.auth.dto.AuthMenuDTO;
 import com.dragoninfo.dcuc.auth.auth.facade.IAuthMenuFacade;
 import com.dragoninfo.dcuc.auth.auth.facade.IRoleFacade;
 import com.dragoninfo.dcuc.auth.sub.dto.AuthUserContactDTO;
 import com.dragoninfo.dcuc.auth.sub.facade.IAuthUserInfoFacade;
 import com.dragoninfo.dcuc.authweb.config.DcucAuthWebConfig;
+import com.dragoninfo.dcuc.common.enums.UserExtInfoEnum;
 import com.dragonsoft.duceap.base.entity.security.SecurityRight;
 import com.dragonsoft.duceap.base.entity.security.SecurityUser;
 import com.dragonsoft.duceap.base.utils.UserContextUtils;
 import com.dragonsoft.duceap.commons.util.collections.CollectionUtils;
 import com.dragonsoft.duceap.commons.util.json.JsonUtils;
 import com.dragonsoft.duceap.commons.util.string.StringUtils;
-import com.dragonsoft.duceap.web.SecurityProperties;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -22,9 +23,7 @@ import org.springframework.web.bind.annotation.RequestHeader;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Optional;
+import java.util.*;
 import java.util.stream.Collectors;
 
 @RestController
@@ -33,15 +32,18 @@ public class DcucLoginController {
 
     @Autowired
     private IAuthMenuFacade menuFacade;
+
     @Autowired
     private IAuthUserInfoFacade authUserInfoFacade;
+
     @Autowired
     private IRoleFacade iRoleFacade;
 
     @Autowired
     private DcucAuthWebConfig dcucAuthWebConfig;
+
     @Autowired
-    private SecurityProperties securityProperties;
+    private IManageInfoFacade manageInfoFacade;
 
     public static final Logger logger = LoggerFactory.getLogger(DcucLoginController.class);
 
@@ -67,6 +69,11 @@ public class DcucLoginController {
             List<SecurityRight> authmenu = getAuthmenu(securityUser);
             securityUser.setSecurityRightList(authmenu);
 
+            Map<String, Object> map = new HashMap<>(UserExtInfoEnum.values().length);
+            map.put(UserExtInfoEnum.USER_TOKEN_ID.getValue(), userToken);
+            map.put(UserExtInfoEnum.APP_TOKEN_ID.getValue(), appToken);
+            securityUser.setExtendtions(map);
+
             logger.info("securityUser:{}", JsonUtils.toJSONString(securityUser));
             UserContextUtils.setCurrentUser(securityUser);
             return securityUser;

src/main/java/com/dragoninfo/dcuc/authweb/restcontroller/sub/AuthSubTaskTypeController.java

@@ -0,0 +1,70 @@
+package com.dragoninfo.dcuc.authweb.restcontroller.sub;
+
+import com.dragoninfo.dcuc.auth.sub.facade.IAuthSubTaskTypeFacade;
+import com.dragoninfo.dcuc.auth.sub.vo.tasktype.AuthSubTaskTypeVo;
+import com.dragoninfo.dcuc.auth.sub.vo.tasktype.TaskTypeTreeVo;
+import com.dragoninfo.dcuc.common.utils.ResponseUtil;
+import com.dragoninfo.duceap.core.response.Result;
+import com.dragonsoft.duceap.base.entity.http.ResponseStatus;
+import com.dragonsoft.duceap.base.entity.search.SearchDTO;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Page;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * @author mazq
+ * @date 2023/2/13
+ */
+@Api(tags = "主体任务类型管理")
+@RestController
+@RequestMapping(value = "/authsvr/v2/subTaskType")
+public class AuthSubTaskTypeController {
+
+    private IAuthSubTaskTypeFacade taskTypeFacade;
+
+    @Autowired
+    public void setTaskTypeFacade(IAuthSubTaskTypeFacade taskTypeFacade) {
+        this.taskTypeFacade = taskTypeFacade;
+    }
+
+
+    @ApiOperation("任务类型分页查询")
+    @ApiImplicitParam(name = "searchable", value = "分页查询条件")
+    @PostMapping("pageSearch")
+    Result<List<AuthSubTaskTypeVo>> pageSearch(SearchDTO searchDTO) {
+        Page<AuthSubTaskTypeVo> voPage = taskTypeFacade.pageSearch(searchDTO);
+        return Result.success(voPage.getTotalElements(), voPage.getContent());
+    }
+
+    @ApiOperation("任务类型树")
+    @GetMapping("tree")
+    Result<List<TaskTypeTreeVo>> taskTypeTree() {
+        List<TaskTypeTreeVo> treeVos = taskTypeFacade.taskTypeTree();
+        return Result.success(treeVos);
+    }
+
+    @ApiOperation("任务类型导入")
+    @ApiImplicitParam(name = "fileId", value = "上传文件id")
+    @GetMapping("taskTypeImp")
+    ResponseStatus taskTypeImp(@RequestParam("fileId") String fileId) {
+        return taskTypeFacade.taskTypeImp(fileId);
+    }
+
+    @ApiOperation(value = "任务类型同步")
+    @GetMapping("taskTypeSync")
+    Result<Object> taskTypeSync() {
+        ResponseStatus responseStatus = taskTypeFacade.taskTypeSync();
+        if (ResponseUtil.isSuccess(responseStatus)) {
+            return Result.success();
+        } else {
+            return Result.failMessage(responseStatus.getMessage());
+        }
+    }
+
+
+}