Merge remote-tracking branch 'origin/master'

# Conflicts:
#	renren-admin/src/main/java/io/renren/modules/processForm/listener/CorrectionListener.java
#	renren-admin/src/main/java/io/renren/modules/resourceMountApply/listener/ResourceOwnerListener.java

renren-admin/src/main/java/io/renren/common/controller/CensusController.java

@@ -0,0 +1,87 @@
+package io.renren.common.controller;
+
+
+import io.renren.common.utils.Result;
+import io.renren.modules.resource.service.ResourceService;
+import io.renren.modules.sys.service.SysUserService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.*;
+import java.util.concurrent.CompletableFuture;
+import java.util.stream.Collectors;
+
+/**
+ * 统计
+ */
+@Api(tags = "全局统计中心")
+@RestController
+@RequestMapping("/census/center")
+public class CensusController {
+
+    private static Logger logger = LoggerFactory.getLogger(CensusController.class);
+
+    @Autowired
+    private ResourceService resourceService;
+    @Autowired
+    private SysUserService sysUserService;
+
+    @Value("${census.type}")
+    private String[] censusTypes; // 大数据局名称
+
+
+    /**
+     * 获取各类资源数目
+     *
+     * @return
+     */
+    @GetMapping(value = "/resource_amount")
+    @ApiOperation("各类资源数目")
+    public Result<List<Map<String, Object>>> resourceAmount() {
+        List<Map<String, Object>> dbAmount = resourceService.getAmountGroupByType();
+        List<String> temp = dbAmount.stream().map(index -> index.get("type").toString()).collect(Collectors.toList());
+        Arrays.stream(censusTypes).filter(index -> !temp.contains(index)).forEach(index -> { // 数据库内不存在的资源类型
+            Map<String, Object> nullMap = new HashMap<String, Object>() {
+                {
+                    put("amount", 0);
+                    put("type", index);
+                }
+            };
+            dbAmount.add(nullMap);
+        });
+        Long sum = dbAmount.stream().mapToLong(index -> Long.valueOf(index.get("amount").toString())).sum();
+        Map<String, Object> sumMap = new HashMap<String, Object>() {
+            {
+                put("amount", sum);
+                put("type", "资源汇聚总量");
+            }
+        };
+        dbAmount.add(sumMap);
+        return new Result<List<Map<String, Object>>>().ok(dbAmount);
+    }
+
+    @GetMapping(value = "/whole_amount")
+    @ApiOperation("平台整体情况")
+    public Result<List<Map<String, Object>>> wholeAmount() {
+        List<Map<String, Object>> result = new ArrayList<Map<String, Object>>();
+        CompletableFuture<Long> resourceAmount = CompletableFuture.supplyAsync(() -> { // 获取资源汇聚总量
+            List<Map<String, Object>> dbAmount = resourceService.getAmountGroupByType();
+            Long sum = dbAmount.stream().mapToLong(index -> Long.valueOf(index.get("amount").toString())).sum();
+            return sum;
+        });
+        CompletableFuture<Long> userAmount = CompletableFuture.supplyAsync(() -> { // 获取平台用户总数
+            return sysUserService.countAllUser();
+        });
+        CompletableFuture<Void> all = CompletableFuture.allOf(resourceAmount, userAmount);
+        all.join();
+
+        return new Result<List<Map<String, Object>>>().ok(result);
+    }
+}

renren-admin/src/main/java/io/renren/common/controller/DemandDataController.java

@@ -31,7 +31,7 @@ import java.util.Map;
 @RestController
 @RequestMapping("/demand_v2/center")
 public class DemandDataController {
-    private static Logger logger = LoggerFactory.getLogger(ResourceMountController.class);
+    private static Logger logger = LoggerFactory.getLogger(DemandDataController.class);
 
     @Autowired
     private ActProcessService actProcessService;

renren-admin/src/main/java/io/renren/common/controller/ResourceMountController.java

@@ -13,9 +13,16 @@ import io.renren.modules.activiti.dto.ProcessInstanceDTO;
 import io.renren.modules.activiti.dto.ProcessStartDTO;
 import io.renren.modules.activiti.service.ActProcessService;
 import io.renren.modules.activiti.service.ActRunningService;
+import io.renren.modules.resource.dto.ResourceDTO;
+import io.renren.modules.resource.entity.ResourceEntityDelFlag;
+import io.renren.modules.resource.service.ResourceService;
 import io.renren.modules.resourceMountApply.dto.TResourceBatchMountApplyDTO;
 import io.renren.modules.resourceMountApply.dto.TResourceMountApplyDTO;
+import io.renren.modules.resourceMountApply.dto.TResourceUndercarriageApplyDTO;
 import io.renren.modules.resourceMountApply.service.TResourceMountApplyService;
+import io.renren.modules.security.user.SecurityUser;
+import io.renren.modules.sys.dto.SysUserDTO;
+import io.renren.modules.sys.service.SysUserService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.codehaus.jackson.map.ObjectMapper;
@@ -30,6 +37,7 @@ import org.springframework.web.bind.annotation.RestController;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 import java.util.stream.Collectors;
 
 @Api(tags = "资源上架")
@@ -44,12 +52,26 @@ public class ResourceMountController {
     private ActRunningService actRunningService;
     @Autowired
     private TResourceMountApplyService tResourceMountApplyService;
-    private static String key = "resourcemountapply";
+    @Autowired
+    private ResourceService resourceService;
+    @Autowired
+    private SysUserService sysUserService;
 
-    private static Map<String, Object> params = new HashMap<String, Object>() {
+    private static String apply_key = "resourcemountapply"; // 资源上架
+
+    private static String undercarriage_key = "resourcundercarriageapply"; // 资源下架
+
+    private static Map<String, Object> apply_params = new HashMap<String, Object>() {
         {
             put("isLatestVersion", true); // 取最新版本
-            put("key", key); // 限定 能力资源上架
+            put("key", apply_key); // 限定 能力资源上架
+        }
+    };
+
+    private static Map<String, Object> undercarriage_params = new HashMap<String, Object>() {
+        {
+            put("isLatestVersion", true); // 取最新版本
+            put("key", undercarriage_key); // 限定 资源下架
         }
     };
 
@@ -58,7 +80,7 @@ public class ResourceMountController {
     @ApiOperation("批量进行能力上架申请")
     public Result<List<ProcessInstanceDTO>> apply(@RequestBody TResourceBatchMountApplyDTO tResourceBatchMountApplyDTO) {
         // 仿照请求接口 /act/process/lastestPage
-        PageData<Map<String, Object>> page = actProcessService.page(params);
+        PageData<Map<String, Object>> page = actProcessService.page(apply_params);
         if (page.getTotal() <= 0) { //
             return new Result().error("联系管理员添加流程");
         }
@@ -85,7 +107,7 @@ public class ResourceMountController {
             // 仿照请求接口 /act/running/startOfBusinessKey
             ProcessStartDTO processStartDTO = new ProcessStartDTO();
             processStartDTO.setBusinessKey(tResourceMountApplyDTO.getId().toString());
-            processStartDTO.setProcessDefinitionKey(key); // 限定资源上架
+            processStartDTO.setProcessDefinitionKey(apply_key); // 限定资源上架
             ObjectMapper oMapper = new ObjectMapper();
             Map<String, Object> variables = oMapper.convertValue(tResourceMountApplyDTO, Map.class);
             processStartDTO.setVariables(variables);
@@ -103,4 +125,48 @@ public class ResourceMountController {
             return dto;
         }).filter(index -> ObjectUtil.isNotNull(index)).collect(Collectors.toList()));
     }
+
+    @PostMapping(value = "/undercarriage")
+    @ApiOperation("批量进行能力下架申请")
+    public Result<List<ProcessInstanceDTO>> undercarriage(@RequestBody TResourceUndercarriageApplyDTO tResourceUndercarriageApplyDTO) {
+        // 仿照请求接口 /act/process/lastestPage
+        PageData<Map<String, Object>> page = actProcessService.page(undercarriage_params);
+        if (page.getTotal() <= 0) { //
+            return new Result().error("联系管理员添加流程");
+        }
+        logger.info("---------------------------------------------------");
+        logger.info(JSONObject.toJSONString(tResourceUndercarriageApplyDTO));
+        logger.info("####################################################");
+        return new Result().ok(tResourceUndercarriageApplyDTO.getResource().stream().map(index -> {
+            Long resourceId = Long.valueOf(index.get("resourceId"));
+            String resourceName = index.get("resourceName");
+            Optional<ResourceDTO> resourceDTO = Optional.ofNullable(resourceService.get(resourceId));
+            resourceDTO.ifPresent(dto -> {
+                dto.setUndercarriageReason(tResourceUndercarriageApplyDTO.getReason());
+                dto.setDelFlag(ResourceEntityDelFlag.UNDERCARRIAGE_REVIEW.getFlag()); // 设置为下架审核中
+                String userId = SecurityUser.getUserId().toString();
+                Optional<SysUserDTO> userDTO = Optional.ofNullable(sysUserService.get(Long.valueOf(userId)));
+                userDTO.ifPresent(user -> {
+                    dto.setUndercarriageUserName(user.getRealName());
+                });
+                ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
+                resourceService.update(dto);
+                logger.error(resourceDTO.get().toString());
+            });
+
+            logger.info("-------------------1.保存申请表单成功--------------------------");
+            // 仿照请求接口 /act/running/startOfBusinessKey
+            ProcessStartDTO processStartDTO = new ProcessStartDTO();
+            processStartDTO.setBusinessKey(resourceId.toString());
+            processStartDTO.setProcessDefinitionKey(undercarriage_key); // 限定资源下架
+            ObjectMapper oMapper = new ObjectMapper();
+            Map<String, Object> variables = oMapper.convertValue(resourceDTO.get(), Map.class);
+            processStartDTO.setVariables(variables);
+            ProcessInstanceDTO dto = actRunningService.startOfBusinessKey(processStartDTO);
+            logger.info("-------------------2.启动流程成功--------------------------");
+            logger.info("ProcessInstanceDTO.getBusinessKey:" + dto.getBusinessKey());
+
+            return dto;
+        }).filter(index -> ObjectUtil.isNotNull(index)).collect(Collectors.toList()));
+    }
 }

renren-admin/src/main/java/io/renren/modules/activiti/controller/ActTaskController.java

@@ -14,7 +14,6 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
-import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.*;
@@ -24,11 +23,12 @@ import java.util.Map;
 
 /**
  * 任务管理
+ *
  * @author Jone
  */
 @RestController
 @RequestMapping("/act/task")
-@Api(tags="任务管理")
+@Api(tags = "任务管理")
 public class ActTaskController {
     @Autowired
     private ActTaskService actTaskService;
@@ -38,40 +38,42 @@ public class ActTaskController {
     /**
      * 获取用户任务列表
      * 根据用户ID或角色组获取任务信息
+     *
      * @return
      */
     @GetMapping("page")
     @ApiOperation("待办任务，默认查询所有待办任务。根据用户ID或角色ID查询个人或组的任务")
     @ApiImplicitParams({
-        @ApiImplicitParam(name = Constant.PAGE, value = "当前页码，从1开始", paramType = "query", required = true, dataType="int") ,
+            @ApiImplicitParam(name = Constant.PAGE, value = "当前页码，从1开始", paramType = "query", required = true, dataType = "int"),
-        @ApiImplicitParam(name = Constant.LIMIT, value = "每页显示记录数", paramType = "query",required = true, dataType="int") ,
+            @ApiImplicitParam(name = Constant.LIMIT, value = "每页显示记录数", paramType = "query", required = true, dataType = "int"),
-        @ApiImplicitParam(name = "roleIds", value = "roleIds", paramType = "query", dataType="String"),
+            @ApiImplicitParam(name = "roleIds", value = "roleIds", paramType = "query", dataType = "String"),
-        @ApiImplicitParam(name = "userId", value = "userId", paramType = "query", dataType="String"),
+            @ApiImplicitParam(name = "userId", value = "userId", paramType = "query", dataType = "String"),
-        @ApiImplicitParam(name = "isRoleGroup", value = "是否查询分组", paramType = "query", dataType="String")
+            @ApiImplicitParam(name = "isRoleGroup", value = "是否查询分组", paramType = "query", dataType = "String")
     })
 //    @RequiresPermissions("sys:task:all")
-    public Result<PageData<TaskDTO>> queryUserTaskPage(@ApiIgnore @RequestParam Map<String, Object> params){
+    public Result<PageData<TaskDTO>> queryUserTaskPage(@ApiIgnore @RequestParam Map<String, Object> params) {
         PageData<TaskDTO> page = actTaskService.page(params);
         return new Result<PageData<TaskDTO>>().ok(page);
     }
 
     /**
      * 我的待办列表
+     *
      * @return
      */
     @GetMapping("myToDoTaskPage")
     @ApiOperation("我的待办列表")
     @ApiImplicitParams({
-        @ApiImplicitParam(name = Constant.PAGE, value = "当前页码，从1开始", paramType = "query", required = true, dataType="int") ,
+            @ApiImplicitParam(name = Constant.PAGE, value = "当前页码，从1开始", paramType = "query", required = true, dataType = "int"),
-        @ApiImplicitParam(name = Constant.LIMIT, value = "每页显示记录数", paramType = "query",required = true, dataType="int"),
+            @ApiImplicitParam(name = Constant.LIMIT, value = "每页显示记录数", paramType = "query", required = true, dataType = "int"),
-        @ApiImplicitParam(name = "taskName", value = "任务名称", paramType = "query", dataType="String")
+            @ApiImplicitParam(name = "taskName", value = "任务名称", paramType = "query", dataType = "String")
     })
 //    @RequiresPermissions("sys:task:all")
-    public Result<PageData<TaskDTO>> myToDoTaskPage(@ApiIgnore @RequestParam Map<String, Object> params){
+    public Result<PageData<TaskDTO>> myToDoTaskPage(@ApiIgnore @RequestParam Map<String, Object> params) {
         params.put("userId", SecurityUser.getUserId().toString());
         PageData<TaskDTO> page = actTaskService.page(params);
-        for(TaskDTO taskDTO : page.getList()){
+        for (TaskDTO taskDTO : page.getList()) {
-            if(!StringUtils.isEmpty(taskDTO.getAssignee())){
+            if (!StringUtils.isEmpty(taskDTO.getAssignee())) {
                 SysUserDTO userDTO = sysUserService.get(Long.valueOf(taskDTO.getAssignee()));
                 taskDTO.setAssigneeName(userDTO.getRealName());
             }
@@ -86,7 +88,7 @@ public class ActTaskController {
     @ApiOperation("获取任务详情")
     @LogOperation("获取任务详情")
 //    @RequiresPermissions("sys:task:all")
-    public Result getTaskById(@PathVariable("id") String id){
+    public Result getTaskById(@PathVariable("id") String id) {
         TaskDTO task = actTaskService.taskDetail(id);
         return new Result().ok(task);
     }
@@ -96,10 +98,10 @@ public class ActTaskController {
      */
     @PostMapping("claim")
     @ApiOperation("认领任务")
-    @ApiImplicitParam(name = "taskId", value = "taskId", paramType = "query", dataType="String")
+    @ApiImplicitParam(name = "taskId", value = "taskId", paramType = "query", dataType = "String")
 //    @RequiresPermissions("sys:task:all")
-    public Result claimTask(String taskId){
+    public Result claimTask(String taskId) {
-        if(StringUtils.isEmpty(taskId)){
+        if (StringUtils.isEmpty(taskId)) {
             return new Result().error(ErrorCode.PARAMS_GET_ERROR);
         }
         actTaskService.claimTask(taskId);
@@ -111,10 +113,10 @@ public class ActTaskController {
      */
     @PostMapping("unclaim")
     @ApiOperation("释放任务")
-    @ApiImplicitParam(name = "taskId", value = "任务ID", paramType = "query", dataType="String")
+    @ApiImplicitParam(name = "taskId", value = "任务ID", paramType = "query", dataType = "String")
 //    @RequiresPermissions("sys:task:all")
-    public Result unclaimTask(String taskId){
+    public Result unclaimTask(String taskId) {
-        if(StringUtils.isEmpty(taskId)){
+        if (StringUtils.isEmpty(taskId)) {
             return new Result().error(ErrorCode.PARAMS_GET_ERROR);
         }
         actTaskService.unclaimTask(taskId);
@@ -127,25 +129,26 @@ public class ActTaskController {
     @PostMapping("complete")
     @ApiOperation("任务处理（完成任务）")
     @ApiImplicitParams({
-        @ApiImplicitParam(name = "taskId", value = "任务ID", paramType = "query", dataType="String"),
+            @ApiImplicitParam(name = "taskId", value = "任务ID", paramType = "query", dataType = "String"),
-        @ApiImplicitParam(name = "comment", value = "审批意见", paramType = "query", dataType="String")
+            @ApiImplicitParam(name = "comment", value = "审批意见", paramType = "query", dataType = "String")
     })
 //    @RequiresPermissions("sys:task:all")
-    public Result completeTask(String taskId, String comment){
+    public Result completeTask(String taskId, String comment) {
-        if(StringUtils.isEmpty(taskId)){
+        if (StringUtils.isEmpty(taskId)) {
             return new Result().error(ErrorCode.PARAMS_GET_ERROR);
         }
         actTaskService.completeTask(taskId, comment);
         return new Result();
     }
+
     /**
      * 带参数的任务处理
      */
     @PostMapping("completeByVariables")
     @ApiOperation("带参数的任务处理（完成任务）")
 //    @RequiresPermissions("sys:task:all")
-    public Result completeTaskByVariables(@RequestBody TaskDTO taskDTO){
+    public Result completeTaskByVariables(@RequestBody TaskDTO taskDTO) {
-        if(StringUtils.isEmpty(taskDTO.getTaskId())){
+        if (StringUtils.isEmpty(taskDTO.getTaskId())) {
             return new Result().error(ErrorCode.PARAMS_GET_ERROR);
         }
         actTaskService.completeTaskByVariables(taskDTO);
@@ -158,12 +161,12 @@ public class ActTaskController {
     @PostMapping("entrust")
     @ApiOperation("任务委托")
     @ApiImplicitParams({
-        @ApiImplicitParam(name = "taskId", value = "任务ID", paramType = "query", dataType="String"),
+            @ApiImplicitParam(name = "taskId", value = "任务ID", paramType = "query", dataType = "String"),
-        @ApiImplicitParam(name = "assignee", value = "受理人", paramType = "query", dataType="String")
+            @ApiImplicitParam(name = "assignee", value = "受理人", paramType = "query", dataType = "String")
     })
 //    @RequiresPermissions("sys:task:all")
-    public Result taskEntrust(String taskId, String assignee){
+    public Result taskEntrust(String taskId, String assignee) {
-        if(StringUtils.isEmpty(taskId) || StringUtils.isEmpty(assignee)){
+        if (StringUtils.isEmpty(taskId) || StringUtils.isEmpty(assignee)) {
             return new Result().error(ErrorCode.PARAMS_GET_ERROR);
         }
         String depositorId = SecurityUser.getUserId().toString();
@@ -177,12 +180,12 @@ public class ActTaskController {
     @GetMapping("getTaskVariables")
     @ApiOperation("获取流程变量")
     @ApiImplicitParams({
-        @ApiImplicitParam(name = "taskId", value = "当前任务ID", paramType = "query", dataType="String"),
+            @ApiImplicitParam(name = "taskId", value = "当前任务ID", paramType = "query", dataType = "String"),
-        @ApiImplicitParam(name = "variableName", value = "参数的键", paramType = "query", dataType="String")
+            @ApiImplicitParam(name = "variableName", value = "参数的键", paramType = "query", dataType = "String")
     })
 //    @RequiresPermissions("sys:task:all")
-    public Result getTaskVariables(String taskId, String variableName){
+    public Result getTaskVariables(String taskId, String variableName) {
-        if(StringUtils.isEmpty(taskId) || StringUtils.isEmpty(variableName)){
+        if (StringUtils.isEmpty(taskId) || StringUtils.isEmpty(variableName)) {
             return new Result().error(ErrorCode.PARAMS_GET_ERROR);
         }
         return new Result().ok(actTaskService.getTaskVariables(taskId, variableName));
@@ -194,8 +197,8 @@ public class ActTaskController {
     @PostMapping("updateTaskVariable")
     @ApiOperation("更新任务变量")
 //    @RequiresPermissions("sys:task:all")
-    public Result updateTaskVariable(@RequestBody TaskDTO taskDTO){
+    public Result updateTaskVariable(@RequestBody TaskDTO taskDTO) {
-        if(StringUtils.isEmpty(taskDTO.getTaskId())){
+        if (StringUtils.isEmpty(taskDTO.getTaskId())) {
             return new Result().error(ErrorCode.PARAMS_GET_ERROR);
         }
         actTaskService.updateTaskVariable(taskDTO);
@@ -207,10 +210,10 @@ public class ActTaskController {
      */
     @DeleteMapping("deleteTaskVariables")
     @ApiOperation("删除任务的所有变量")
-    @ApiImplicitParam(name = "taskId", value = "当前任务ID", paramType = "query", dataType="String")
+    @ApiImplicitParam(name = "taskId", value = "当前任务ID", paramType = "query", dataType = "String")
 //    @RequiresPermissions("sys:task:all")
-    public Result deleteTaskVariables(String taskId){
+    public Result deleteTaskVariables(String taskId) {
-        if(StringUtils.isEmpty(taskId)){
+        if (StringUtils.isEmpty(taskId)) {
             return new Result().error(ErrorCode.PARAMS_GET_ERROR);
         }
         actTaskService.deleteTaskVariables(taskId);
@@ -223,13 +226,13 @@ public class ActTaskController {
     @DeleteMapping("deleteVariable")
     @ApiOperation("删除指定变量，默认删除本地变量")
     @ApiImplicitParams({
-        @ApiImplicitParam(name = "taskId", value = "当前任务ID", paramType = "query", dataType="String"),
+            @ApiImplicitParam(name = "taskId", value = "当前任务ID", paramType = "query", dataType = "String"),
-        @ApiImplicitParam(name = "variableName", value = "变量名", paramType = "query", dataType="String"),
+            @ApiImplicitParam(name = "variableName", value = "变量名", paramType = "query", dataType = "String"),
-        @ApiImplicitParam(name = "scope", value = "变量的范围（local：本地；global,全局）", paramType = "query", dataType="String")
+            @ApiImplicitParam(name = "scope", value = "变量的范围（local：本地；global,全局）", paramType = "query", dataType = "String")
     })
 //    @RequiresPermissions("sys:task:all")
-    public Result deleteVariable(String taskId, String variableName, String scope){
+    public Result deleteVariable(String taskId, String variableName, String scope) {
-        if(StringUtils.isEmpty(taskId) || StringUtils.isEmpty(variableName)){
+        if (StringUtils.isEmpty(taskId) || StringUtils.isEmpty(variableName)) {
             return new Result().error(ErrorCode.PARAMS_GET_ERROR);
         }
         actTaskService.deleteTaskVariable(taskId, variableName, scope);
@@ -242,12 +245,12 @@ public class ActTaskController {
     @PostMapping("backPreviousTask")
     @ApiOperation("回退任务到上一节点")
     @ApiImplicitParams({
-        @ApiImplicitParam(name = "taskId", value = "任务ID", paramType = "query", dataType="String"),
+            @ApiImplicitParam(name = "taskId", value = "任务ID", paramType = "query", dataType = "String"),
-        @ApiImplicitParam(name = "comment", value = "回退审核意见", paramType = "query", dataType="String")
+            @ApiImplicitParam(name = "comment", value = "回退审核意见", paramType = "query", dataType = "String")
     })
 //    @RequiresPermissions("sys:task:all")
-    public Result backPreviousTask(String taskId, String comment){
+    public Result backPreviousTask(String taskId, String comment) {
-        if(StringUtils.isEmpty(taskId)){
+        if (StringUtils.isEmpty(taskId)) {
             return new Result().error(ErrorCode.PARAMS_GET_ERROR);
         }
         actTaskService.doBackPreviousTask(taskId, comment);
@@ -260,11 +263,11 @@ public class ActTaskController {
     @PostMapping("endProcess")
     @ApiOperation("终止流程")
     @ApiImplicitParams({
-        @ApiImplicitParam(name = "taskId", value = "任务ID", paramType = "query", dataType="String"),
+            @ApiImplicitParam(name = "taskId", value = "任务ID", paramType = "query", dataType = "String"),
-        @ApiImplicitParam(name = "comment", value = "终止审核意见", paramType = "query", dataType="String")
+            @ApiImplicitParam(name = "comment", value = "终止审核意见", paramType = "query", dataType = "String")
     })
 //    @RequiresPermissions("sys:task:all")
-    public Result endProcess(String taskId, String comment){
+    public Result endProcess(String taskId, String comment) {
         actTaskService.endProcess(taskId, comment);
         return new Result();
     }
@@ -275,12 +278,12 @@ public class ActTaskController {
     @PostMapping("backToFirst")
     @ApiOperation("驳回，回退至第一个用户任务")
     @ApiImplicitParams({
-        @ApiImplicitParam(name = "taskId", value = "任务ID", paramType = "query", dataType="String"),
+            @ApiImplicitParam(name = "taskId", value = "任务ID", paramType = "query", dataType = "String"),
-        @ApiImplicitParam(name = "comment", value = "驳回审核意见", paramType = "query", dataType="String")
+            @ApiImplicitParam(name = "comment", value = "驳回审核意见", paramType = "query", dataType = "String")
     })
 //    @RequiresPermissions("sys:task:all")
-    public Result backToFirst(String taskId, String comment){
+    public Result backToFirst(String taskId, String comment) {
-        if(StringUtils.isEmpty(taskId)){
+        if (StringUtils.isEmpty(taskId)) {
             return new Result().error(ErrorCode.PARAMS_GET_ERROR);
         }
         actTaskService.backToFirst(taskId, comment);

renren-admin/src/main/java/io/renren/modules/activiti/service/ActHistoryService.java

@@ -6,6 +6,8 @@ import io.renren.modules.activiti.dto.ProcessInstanceDTO;
 import io.renren.modules.activiti.dto.TaskDTO;
 import io.renren.modules.processForm.dto.TAbilityApplicationDTO;
 import io.renren.modules.processForm.service.TAbilityApplicationService;
+import io.renren.modules.resource.dto.ResourceDTO;
+import io.renren.modules.resource.service.ResourceService;
 import io.renren.modules.resourceMountApply.dto.TResourceMountApplyDTO;
 import io.renren.modules.resourceMountApply.service.TResourceMountApplyService;
 import io.renren.modules.security.user.SecurityUser;
@@ -72,6 +74,8 @@ public class ActHistoryService {
 
     @Autowired
     private SysUserService sysUserService;
+    @Autowired
+    private ResourceService resourceService;
 
     @Autowired
     private TAbilityApplicationService tAbilityApplicationService;
@@ -267,6 +271,12 @@ public class ActHistoryService {
                     if (resourceMountApplyDTO != null) {
                         dto.setName(resourceMountApplyDTO.getResourceDTO().getName());
                         dto.setResourceId(resourceMountApplyDTO.getResourceDTO().getId().toString());
+                    } else {
+                        ResourceDTO resourceDTO = resourceService.get(Long.valueOf(dto.getBusinessKey()));
+                        if (resourceDTO != null) {
+                            dto.setName(resourceDTO.getName());
+                            dto.setResourceId(resourceDTO.getId().toString());
+                        }
                     }
                 }
             }

renren-admin/src/main/java/io/renren/modules/activiti/service/ActTaskService.java

@@ -12,6 +12,8 @@ import io.renren.modules.demanData.dto.TDemandDataDTO;
 import io.renren.modules.demanData.service.TDemandDataService;
 import io.renren.modules.processForm.dto.TAbilityApplicationDTO;
 import io.renren.modules.processForm.service.TAbilityApplicationService;
+import io.renren.modules.resource.dto.ResourceDTO;
+import io.renren.modules.resource.service.ResourceService;
 import io.renren.modules.resourceMountApply.dto.TResourceMountApplyDTO;
 import io.renren.modules.resourceMountApply.service.TResourceMountApplyService;
 import io.renren.modules.security.user.SecurityUser;
@@ -79,6 +81,8 @@ public class ActTaskService extends BaseServiceImpl {
 
     @Autowired
     private TDemandDataService tDemandDataService;
+    @Autowired
+    private ResourceService resourceService;
 
     /**
      * 根据参数获取当前运行的任务信息
@@ -122,25 +126,37 @@ public class ActTaskService extends BaseServiceImpl {
         for (Task task : list) {
             TaskDTO dto = new TaskDTO();
             this.convertTaskInfo(task, dto);
+            ObjectMapper oMapper = new ObjectMapper();
+
             TAbilityApplicationDTO abilityApplicationDTO =
                     tAbilityApplicationService.get(Long.valueOf(dto.getBusinessKey()));
-            TResourceMountApplyDTO resourceMountApplyDTO = tResourceMountApplyService.get(Long.valueOf(dto.getBusinessKey()));
-            TDemandDataDTO tDemandDataDTO = tDemandDataService.get(Long.valueOf(dto.getBusinessKey()));
             if (abilityApplicationDTO != null) {
-                ObjectMapper oMapper = new ObjectMapper();
                 Map<String, Object> variables = oMapper.convertValue(abilityApplicationDTO, Map.class);
                 dto.setParams(variables);
-            } else if (resourceMountApplyDTO != null) {
+                listDto.add(dto);
-                ObjectMapper oMapper = new ObjectMapper();
+                continue;
+            }
+            TResourceMountApplyDTO resourceMountApplyDTO = tResourceMountApplyService.get(Long.valueOf(dto.getBusinessKey()));
+            if (resourceMountApplyDTO != null) {
                 Map<String, Object> variables = oMapper.convertValue(resourceMountApplyDTO, Map.class);
                 dto.setParams(variables);
-            } else if (tDemandDataDTO != null) {
+                listDto.add(dto);
-                ObjectMapper oMapper = new ObjectMapper();
+                continue;
+            }
+            TDemandDataDTO tDemandDataDTO = tDemandDataService.get(Long.valueOf(dto.getBusinessKey()));
+            if (tDemandDataDTO != null) {
                 Map<String, Object> variables = oMapper.convertValue(tDemandDataDTO, Map.class);
                 dto.setParams(variables);
+                listDto.add(dto);
+                continue;
+            }
+            ResourceDTO resourceDTO = resourceService.get(Long.valueOf(dto.getBusinessKey()));
+            if (resourceDTO != null) {
+                Map<String, Object> variables = oMapper.convertValue(resourceDTO, Map.class);
+                dto.setParams(variables);
+                listDto.add(dto);
+                continue;
             }
-
-            listDto.add(dto);
         }
         return new PageData<>(listDto, (int) taskQuery.count());
     }

renren-admin/src/main/java/io/renren/modules/demanData/listener/DemandDataListener.java

@@ -119,7 +119,7 @@ public class DemandDataListener implements TaskListener, ExecutionListener, Acti
         JsonElement jsonElement = gson.toJsonTree(kv);
         TDemandDataDTO demandDataDTO = gson.fromJson(jsonElement, TDemandDataDTO.class);
 
-        if (demandDataDTO != null) {
+        if (demandDataDTO != null && demandDataDTO.getApplyUserDeptId() != null) {
             logger.error(JSONObject.toJSONString(demandDataDTO));
             SysDeptDTO deptDTO =
                     sysDeptService.get(Long.valueOf(demandDataDTO.getApplyUserDeptId()));

renren-admin/src/main/java/io/renren/modules/processForm/listener/CorrectionListener.java

@@ -2,12 +2,9 @@ package io.renren.modules.processForm.listener;
 
 import com.google.gson.Gson;
 import com.google.gson.JsonElement;
-import io.renren.modules.activiti.service.ActTaskService;
 import io.renren.modules.processForm.dto.TAbilityApplicationDTO;
-import io.renren.modules.processForm.service.ApiGatewayService;
 import io.renren.modules.processForm.service.TAbilityApplicationService;
 import io.renren.modules.resource.dto.ResourceDTO;
-import io.renren.modules.resource.entity.ResourceEntity;
 import io.renren.modules.resource.service.ResourceService;
 import io.renren.modules.sys.dto.SysDeptDTO;
 import io.renren.modules.sys.dto.SysRoleDTO;
@@ -52,17 +49,12 @@ public class CorrectionListener implements TaskListener, ExecutionListener, Acti
     @Autowired
     private TaskService taskService;
     @Autowired
-    private HistoryService historyService;
-    @Autowired
     private SysUserService sysUserService;
     @Autowired
     private SysRoleUserService sysRoleUserService;
     @Autowired
     private SysDeptService sysDeptService;
 
-    @Autowired
-    private ApiGatewayService apiGatewayService;
-
     @Autowired
     private ResourceService resourceService;
     @Autowired
@@ -76,9 +68,6 @@ public class CorrectionListener implements TaskListener, ExecutionListener, Acti
             case EVENTNAME_CREATE:
                 create(delegateTask);
                 break;
-            case EVENTNAME_COMPLETE:
-                complete(delegateTask);
-                break;
             default:
         }
         logger.error("-------------------------结束部门动态审批人流程-------------------------------");
@@ -91,7 +80,7 @@ public class CorrectionListener implements TaskListener, ExecutionListener, Acti
         final String eventName = delegateExecution.getEventName();
         switch (eventName) {
             case EVENTNAME_END:
-                endTake(delegateExecution);
+                endTake(delegateExecution.getVariables());
                 break;
         }
     }
@@ -116,10 +105,9 @@ public class CorrectionListener implements TaskListener, ExecutionListener, Acti
     /**
      * 结束审批
      *
-     * @param delegateExecution
+     * @param kv
      */
-    private void endTake(DelegateExecution delegateExecution) { // 进入最后结束节点
+    private void endTake(Map<String, Object> kv) { // 进入最后结束节点
-        Map<String, Object> kv = delegateExecution.getVariables();
         Gson gson = new Gson();
         JsonElement jsonElement = gson.toJsonTree(kv);
         TAbilityApplicationDTO abilityApplicationDTO = gson.fromJson(jsonElement, TAbilityApplicationDTO.class);
@@ -180,44 +168,4 @@ public class CorrectionListener implements TaskListener, ExecutionListener, Acti
             taskService.setAssignee(delegateTask.getId(), "1516728698224427010");
         }
     }
-
-    private void complete(DelegateTask delegateTask) {
-        Map<String, Object> kv = delegateTask.getVariables();
-
-        //如果有code说明已经注册过了,以及只有通过的流程申请
-        if (kv.get("gatewayCode") != null ||
-                !ActTaskService.Task_HANDLE_STATE_AGREE.equals(kv.get(ActTaskService.Task_HANDLE_STATE))) return;
-
-        Gson gson = new Gson();
-        JsonElement jsonElement = gson.toJsonTree(kv);
-        TAbilityApplicationDTO abilityApplicationDTO = gson.fromJson(jsonElement, TAbilityApplicationDTO.class);
-        applyCode(delegateTask, abilityApplicationDTO);
-    }
-
-    /**
-     * 审批通过，申请code
-     * @param delegateTask
-     * @param abilityApplicationDTO
-     */
-    private void applyCode(DelegateTask delegateTask, TAbilityApplicationDTO abilityApplicationDTO) {
-
-        logger.info("-------能力申请code-------");
-        ResourceEntity resourceEntity = resourceService.selectById(abilityApplicationDTO.getResourceId());
-
-        //没有groupid当做没有接口，直接跳过
-        if (resourceEntity.getGroupId() == null)
-            return;
-
-        String code = UUID.randomUUID().toString();
-        apiGatewayService.subscribeCode(String.valueOf(abilityApplicationDTO.getId()), code);
-
-        delegateTask.setVariable("gatewayCode", code);
-
-        String apiPrefix = "/juapi/" + abilityApplicationDTO.getResourceId();
-        TaskService taskService = ProcessEngines.getDefaultProcessEngine().getTaskService();
-        String msg = String.format("您的能力申请已通过，接口认证code为：%s, 接口公共前缀为：%s",code, apiPrefix);
-        taskService.addComment(delegateTask.getId(), delegateTask.getProcessInstanceId(), msg);
-
-
-    }
 }

renren-admin/src/main/java/io/renren/modules/processForm/listener/DataCenterListener.java

@@ -1,5 +1,10 @@
 package io.renren.modules.processForm.listener;
 
+import com.google.gson.Gson;
+import com.google.gson.JsonElement;
+import io.renren.modules.processForm.dto.TAbilityApplicationDTO;
+import io.renren.modules.resource.dto.ResourceDTO;
+import io.renren.modules.resource.service.ResourceService;
 import io.renren.modules.sys.dto.SysDeptDTO;
 import io.renren.modules.sys.dto.SysRoleDTO;
 import io.renren.modules.sys.dto.SysUserDTO;
@@ -17,6 +22,9 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 
+import java.util.Map;
+import java.util.Optional;
+
 /**
  * 大数据局动态审批人
  */
@@ -39,6 +47,8 @@ public class DataCenterListener implements TaskListener, ExecutionListener, Acti
     private SysRoleUserService sysRoleUserService;
     @Autowired
     private SysDeptService sysDeptService;
+    @Autowired
+    private ResourceService resourceService;
 
     @Override
     public void notify(DelegateExecution delegateExecution) throws Exception {
@@ -96,5 +106,18 @@ public class DataCenterListener implements TaskListener, ExecutionListener, Acti
             delegateTask.setAssignee("1516728698224427010");
             logger.info("未查到该部门对应 " + roleName);
         }
+
+        Map<String, Object> kv = delegateTask.getVariables();
+        Gson gson = new Gson();
+        JsonElement jsonElement = gson.toJsonTree(kv);
+        TAbilityApplicationDTO abilityApplicationDTO = gson.fromJson(jsonElement, TAbilityApplicationDTO.class);
+        Optional<ResourceDTO> resourceDTOOptional = Optional.ofNullable(resourceService.get(Long.valueOf(abilityApplicationDTO.getResourceId())));
+        resourceDTOOptional.ifPresent(resource -> {
+            if ("免批申请".equals(resource.getShareCondition())) { // 针对免批资源申请
+                taskService.addComment(delegateTask.getId(), delegateTask.getProcessInstanceId(), "免批资源申请默认通过");
+                taskService.complete(delegateTask.getId(), delegateTask.getVariables());
+            }
+        });
+
     }
 }

renren-admin/src/main/java/io/renren/modules/resource/controller/ResourceController.java

@@ -50,7 +50,9 @@ public class ResourceController {
             @ApiImplicitParam(name = "creator", value = "创建者用户id", paramType = "query", dataType = "String")
     })
     public Result<PageData<ResourceDTO>> page(@ApiIgnore @RequestParam Map<String, Object> params) {
-        params.put("del_flag", 0);
+        if (!params.containsKey("del_flag")) {
+            params.put("del_flag", 0);
+        }
         PageData<ResourceDTO> page = resourceService.page(params);
         page.getList().forEach(item -> {
             item.setInfoList(resourceService.selectAttrsByResourceId(item.getId()));
@@ -65,11 +67,18 @@ public class ResourceController {
         return new Result<>().ok(resourceService.pageWithAttrs(jsonObject));
     }
 
+    @GetMapping("/{id}")
+    @ApiOperation("信息")
+    public Result<ResourceDTO> get(@PathVariable("id") Long id) {
+        ResourceDTO data = resourceService.get(id);
+        return new Result<ResourceDTO>().ok(data);
+    }
+
     @GetMapping("/select/{id}")
     @ApiOperation("查询资源详细信息")
     @LogOperation("查询资源详细信息")
     //@RequiresPermissions("resource:resource:info")
-    public Result<ResourceDTO> get(@PathVariable("id") Long id) {
+    public Result<ResourceDTO> select(@PathVariable("id") Long id) {
         ResourceDTO data = resourceService.selectWithAttrs(id);
         return new Result<ResourceDTO>().ok(data);
     }

renren-admin/src/main/java/io/renren/modules/resource/dao/ResourceDao.java

@@ -3,6 +3,7 @@ package io.renren.modules.resource.dao;
 import io.renren.common.dao.BaseDao;
 import io.renren.modules.resource.dto.ResourceDTO;
 import io.renren.modules.resource.entity.ResourceEntity;
+import org.apache.ibatis.annotations.MapKey;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -10,11 +11,11 @@ import java.util.List;
 import java.util.Map;
 
 /**
-* 资源表
+ * 资源表
-*
+ *
-* @author dg 
+ * @author dg
-* @since 1.0 2022-04-13
+ * @since 1.0 2022-04-13
-*/
+ */
 @Mapper
 public interface ResourceDao extends BaseDao<ResourceEntity> {
 
@@ -28,13 +29,21 @@ public interface ResourceDao extends BaseDao<ResourceEntity> {
 
     List<ResourceDTO> selectMostPopular(Map<String, Object> selectMap);
 
-    ResourceDTO selectDTOById(@Param("id") Long id,@Param("userId") Long userId);
+    ResourceDTO selectDTOById(@Param("id") Long id, @Param("userId") Long userId);
 
-    List<ResourceDTO> selectDTOPage(@Param("dto")ResourceDTO resourceDTO,
+    List<ResourceDTO> selectDTOPage(@Param("dto") ResourceDTO resourceDTO,
                                     @Param("pageNum") Integer pageNum,
                                     @Param("pageSize") Integer pageSize,
-                                    @Param("orderField")String orderField,
+                                    @Param("orderField") String orderField,
                                     @Param("orderType") String orderType);
 
     List<Map> selectApplyArea(Long userId);
+
+    /**
+     * 获取各类资源数目
+     *
+     * @return
+     */
+    @MapKey("type")
+    List<Map<String, Object>> getAmountGroupByType();
 }

renren-admin/src/main/java/io/renren/modules/resource/dto/ResourceDTO.java

@@ -1,6 +1,7 @@
 package io.renren.modules.resource.dto;
 
 import io.renren.modules.resource.entity.AttrEntity;
+import io.renren.modules.resource.entity.ResourceEntityDelFlag;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -8,13 +9,14 @@ import lombok.Data;
 import java.io.Serializable;
 import java.util.Date;
 import java.util.List;
+import java.util.Optional;
 
 /**
-* 资源表
+ * 资源表
-*
+ *
-* @author dg 
+ * @author dg
-* @since 1.0 2022-04-13
+ * @since 1.0 2022-04-13
-*/
+ */
 @Data
 @ApiModel(value = "资源表")
 public class ResourceDTO implements Serializable {
@@ -54,6 +56,8 @@ public class ResourceDTO implements Serializable {
     private Long visits;
     @ApiModelProperty(value = "删除标志：0:正常；1:已删除；2:待审核；3:审核中；9其他")
     private Integer delFlag;
+    @ApiModelProperty(value = "删除标志tip：0:正常；1:已删除；2:待审核；3:审核中；9其他")
+    private String delFlagTip;
     @ApiModelProperty(value = "创建人")
     private Long creator;
     @ApiModelProperty(value = "创建时间")
@@ -92,5 +96,23 @@ public class ResourceDTO implements Serializable {
 
     @ApiModelProperty(value = "附件")
     private String enclosure;
+    @ApiModelProperty(value = "下架理由")
+    private String undercarriageReason;
+    @ApiModelProperty(value = "提起下架人员姓名")
+    private String undercarriageUserName;
 
+    public String getDelFlagTip() {
+        if (this.delFlag != null) {
+            Optional<ResourceEntityDelFlag> resourceEntityDelFlagOptional = Optional.ofNullable(ResourceEntityDelFlag.getByFlag(this.delFlag));
+            if (resourceEntityDelFlagOptional.isPresent()) {
+                return resourceEntityDelFlagOptional.get().getTip();
+            }
+            return "";
+        }
+        return "";
+    }
+
+    public void setDelFlagTip(String delFlagTip) {
+        this.delFlagTip = delFlagTip;
+    }
 }

renren-admin/src/main/java/io/renren/modules/resource/entity/ResourceEntity.java

@@ -19,11 +19,6 @@ import java.util.Date;
 public class ResourceEntity extends BaseEntity {
 	private static final long serialVersionUID = 1L;
 
-//	/**
-//	* 主键
-//	*/
-//	@TableId(type = IdType.INPUT)
-//	private Long id;
 	/**
 	* 类型：基础设施，数据资源等
 	*/
@@ -88,16 +83,7 @@ public class ResourceEntity extends BaseEntity {
 	* 删除标志：0:正常；1:已删除；9其他
 	*/
 	private Integer delFlag;
-//	/**
+
-//	* 创建人
-//	*/
-//	@TableField(fill = FieldFill.INSERT)
-//	private Long creator;
-//	/**
-//	* 创建时间
-//	*/
-//	@TableField(fill = FieldFill.INSERT)
-//	private Date createDate;
 	/**
 	* 修改人
 	*/
@@ -134,4 +120,15 @@ public class ResourceEntity extends BaseEntity {
 	 * 附件
 	 */
 	private String enclosure;
+
+	/**
+	 * 下架理由
+	 */
+	private String undercarriageReason;
+
+
+	/**
+	 * 提起下架人员
+	 */
+	private String undercarriageUserName;
 }

renren-admin/src/main/java/io/renren/modules/resource/entity/ResourceEntityDelFlag.java

@@ -0,0 +1,73 @@
+package io.renren.modules.resource.entity;
+
+
+import java.util.Arrays;
+
+/**
+ * ResourceEntity del_flag 枚举
+ */
+public enum ResourceEntityDelFlag {
+
+    /**
+     * 正常
+     */
+    NORMAL(0, "正常"),
+    /**
+     * 已删除
+     */
+    DELETED(1, "已删除"),
+    /**
+     * 上架待审核
+     */
+    PENDING_REVIEW(2, "上架待审核"),
+    /**
+     * 上架审核中
+     */
+    UNDER_REVIEW(3, "上架审核中"),
+    /**
+     * 下架审核中
+     */
+    UNDERCARRIAGE_REVIEW(4, "下架审核中"),
+    /**
+     * 已下架
+     */
+    UNDERCARRIAGE(5, "已下架"),
+    /**
+     * 其他
+     */
+    OTHER(9, "其他"),
+    /**
+     * 未知
+     */
+    UNKNOWN(10, "未知");
+
+    private int flag;
+    private String tip;
+
+    ResourceEntityDelFlag(int flag, String tip) {
+        this.flag = flag;
+        this.tip = tip;
+    }
+
+    public static ResourceEntityDelFlag getByFlag(int flag) {
+        ResourceEntityDelFlag[] index = ResourceEntityDelFlag.values();
+        return Arrays.asList(index).stream().filter(index_ -> index_.flag == flag).findAny().orElse(ResourceEntityDelFlag.UNKNOWN);
+    }
+
+
+    public int getFlag() {
+        return flag;
+    }
+
+    public void setFlag(int flag) {
+        this.flag = flag;
+    }
+
+    public String getTip() {
+        return tip;
+    }
+
+    public void setTip(String tip) {
+        this.tip = tip;
+    }
+}

renren-admin/src/main/java/io/renren/modules/resource/listener/ResourceUndercarriageListener.java

@@ -0,0 +1,152 @@
+package io.renren.modules.resource.listener;
+
+import com.google.gson.Gson;
+import com.google.gson.JsonElement;
+import io.renren.modules.resource.dto.ResourceDTO;
+import io.renren.modules.resource.entity.ResourceEntityDelFlag;
+import io.renren.modules.resource.service.ResourceService;
+import io.renren.modules.sys.dto.SysDeptDTO;
+import io.renren.modules.sys.dto.SysRoleDTO;
+import io.renren.modules.sys.dto.SysUserDTO;
+import io.renren.modules.sys.service.SysDeptService;
+import io.renren.modules.sys.service.SysRoleService;
+import io.renren.modules.sys.service.SysUserService;
+import org.activiti.engine.TaskService;
+import org.activiti.engine.delegate.DelegateExecution;
+import org.activiti.engine.delegate.DelegateTask;
+import org.activiti.engine.delegate.ExecutionListener;
+import org.activiti.engine.delegate.TaskListener;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
+
+import java.util.Map;
+
+
+/**
+ * 资源下线审核
+ */
+@Component
+public class ResourceUndercarriageListener implements TaskListener, ExecutionListener {
+    private static Logger logger = LoggerFactory.getLogger(ResourceUndercarriageListener.class);
+
+    @Value("${big_date.name}")
+    private String bigDateDeptName; // 大数据局名称
+    @Value("${big_date.assignee_role_name}")
+    private String roleName; // 具备审批的角色名称
+
+    @Autowired
+    private SysRoleService sysRoleService;
+    @Autowired
+    private TaskService taskService;
+    @Autowired
+    private SysUserService sysUserService;
+
+    @Autowired
+    private SysDeptService sysDeptService;
+    @Autowired
+    private ResourceService resourceService;
+
+    @Override
+    public void notify(DelegateTask delegateTask) {
+        logger.error("----------------------进入资源所有者节点---------------------------");
+        logger.error("事件类型：" + delegateTask.getEventName());
+        SysRoleDTO roleDTO = sysRoleService.getByName(roleName);
+        logger.error("roleDTOId:" + roleDTO.getId());
+        final String eventName = delegateTask.getEventName();
+        switch (eventName) {
+            case EVENTNAME_CREATE: // 创建当前审批节点事件
+                create(delegateTask, roleDTO);
+                break;
+            default:
+                logger.error("未处理该事件：" + eventName);
+        }
+        logger.error("-----------------------结束资源所有者节点---------------------------");
+
+    }
+
+    @Override
+    public void notify(DelegateExecution execution) throws Exception {
+        logger.error("----------------------进入审批通过节点---------------------------");
+        logger.error("事件类型：" + execution.getEventName());
+        final String eventName = execution.getEventName();
+        switch (eventName) {
+            case EVENTNAME_END: {
+                endTake(execution.getVariables());
+            }
+            break;
+        }
+        logger.error("----------------------结束审批通过节点---------------------------");
+    }
+
+    /**
+     * 下架审核通过
+     *
+     * @param kv
+     */
+    private void endTake(Map<String, Object> kv) { // 进入最后结束节点
+        Gson gson = new Gson();
+        JsonElement jsonElement = gson.toJsonTree(kv);
+        ResourceDTO re = gson.fromJson(jsonElement, ResourceDTO.class);
+        if (re != null) {
+            logger.error(kv.toString());
+            re.setDelFlag(ResourceEntityDelFlag.UNDERCARRIAGE.getFlag());
+            resourceService.update(re);
+            logger.error("下架审批通过 资源id:" + re.getId());
+        }
+    }
+
+    /**
+     * 节点创建时动态分配资源部门审核人
+     *
+     * @param delegateTask
+     * @param roleDTO
+     */
+    private void create(DelegateTask delegateTask, final SysRoleDTO roleDTO) {
+        Map<String, Object> kv = delegateTask.getVariables();
+        Gson gson = new Gson();
+        JsonElement jsonElement = gson.toJsonTree(kv);
+        ResourceDTO re = gson.fromJson(jsonElement, ResourceDTO.class);
+        if (re.getDeptId() != null) {
+            SysDeptDTO deptDTO =
+                    sysDeptService.get(re.getDeptId());
+            SysUserDTO userDTO = null;
+            if (deptDTO.getId() != null) {
+                userDTO = sysUserService.getByDeptIdAndRoleId(deptDTO.getId(), roleDTO.getId()); // 搜出审批人
+            }
+            if (userDTO != null) {
+                logger.error("审批人id:" + userDTO.getId() + "姓名：" + userDTO.getRealName());
+                taskService.setAssignee(delegateTask.getId(), userDTO.getId().toString());
+            } else {
+                logger.error("未查到该部门对应的 " + roleName + " 将使用大数据部门审核人");
+                defaultUser(delegateTask.getId(), roleDTO);
+            }
+        } else {
+            defaultUser(delegateTask.getId(), roleDTO);
+        }
+    }
+
+    /**
+     * 未找到部门对应的审核人
+     *
+     * @param taskId
+     */
+    private void defaultUser(String taskId, final SysRoleDTO roleDTO) {
+        logger.error("大数据局名称：" + bigDateDeptName);
+        SysDeptDTO deptDTO = sysDeptService.getByName(bigDateDeptName);
+        logger.error("roleDTOId:" + roleDTO.getId());
+        SysUserDTO userDTO = sysUserService.getByDeptIdAndRoleId(deptDTO.getId(), roleDTO.getId());
+
+        if (userDTO != null) {
+            logger.error("大数据审批人id:" + userDTO.getId() + "姓名：" + userDTO.getRealName());
+            taskService.setAssignee(taskId, userDTO.getId().toString());
+        } else {
+            logger.error("未查到大数据部门对应 " + roleName);
+            taskService.setAssignee(taskId, "1516728698224427010");
+        }
+    }
+
+
+}

renren-admin/src/main/java/io/renren/modules/resource/service/ResourceService.java

@@ -7,6 +7,7 @@ import io.renren.modules.resource.entity.AttrEntity;
 import io.renren.modules.resource.entity.ResourceEntity;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 资源表
@@ -38,4 +39,5 @@ public interface ResourceService extends CrudService<ResourceEntity, ResourceDTO
 
     Object selectRecommend();
 
+    List<Map<String, Object>> getAmountGroupByType();
 }

renren-admin/src/main/java/io/renren/modules/resource/service/impl/ResourceServiceImpl.java

@@ -15,6 +15,7 @@ import io.renren.modules.resource.dao.ResourceDao;
 import io.renren.modules.resource.dto.ResourceDTO;
 import io.renren.modules.resource.entity.AttrEntity;
 import io.renren.modules.resource.entity.ResourceEntity;
+import io.renren.modules.resource.entity.ResourceEntityDelFlag;
 import io.renren.modules.resource.service.ResourceService;
 import io.renren.modules.resourceCar.dao.ResourceCarDao;
 import io.renren.modules.resourceCollection.dao.ResourceCollectionDao;
@@ -72,13 +73,8 @@ public class ResourceServiceImpl extends CrudServiceImpl<ResourceDao, ResourceEn
             }
         });
 
-//        wrapper.eq("type", params.get("type").toString())
-//                .like(StringUtils.isNotBlank(params.get("name").toString()),"name", params.get("name").toString())
-//                .orderByDesc("create_date")
-//                .eq(StringUtils.isNotBlank(params.get("creator").toString()),"creator", params.get("creator").toString())
-//                .eq("del_flag", 0);
         wrapper.orderByDesc("create_date");
-        if (!params.containsKey("creator")) {
+        if (!params.containsKey("creator")) { // 创建者查询时
             wrapper.eq("del_flag", params.get("del_flag") == null ? 0 : Integer.valueOf(params.get("del_flag").toString()));
         }
         return wrapper;
@@ -92,7 +88,7 @@ public class ResourceServiceImpl extends CrudServiceImpl<ResourceDao, ResourceEn
         Long resourceID = IdWorker.getId(resourceEntity);
         resourceEntity.setId(resourceID);
         if (dto.getDelFlag() == null) {
-            resourceEntity.setDelFlag(0);
+            resourceEntity.setDelFlag(ResourceEntityDelFlag.NORMAL.getFlag());
         }
         resourceDao.insert(resourceEntity);
 
@@ -100,7 +96,7 @@ public class ResourceServiceImpl extends CrudServiceImpl<ResourceDao, ResourceEn
 
         List<AttrEntity> attrEntities = dto.getInfoList();
         attrEntities.forEach(item -> {
-            item.setDelFlag(0);
+            item.setDelFlag(ResourceEntityDelFlag.NORMAL.getFlag());
             item.setDataResourceId(resourceID);
             attrDao.insert(item);
         });
@@ -130,7 +126,7 @@ public class ResourceServiceImpl extends CrudServiceImpl<ResourceDao, ResourceEn
         attrDao.delete4Resource(list);
         List<AttrEntity> attrEntities = dto.getInfoList();
         attrEntities.forEach(item -> {
-            item.setDelFlag(0);
+            item.setDelFlag(ResourceEntityDelFlag.NORMAL.getFlag());
             attrDao.insert(item);
         });
     }
@@ -144,7 +140,7 @@ public class ResourceServiceImpl extends CrudServiceImpl<ResourceDao, ResourceEn
         }
         QueryWrapper<AttrEntity> wrapper = new QueryWrapper<>();
         wrapper.eq("data_resource_id", id)
-                .eq("del_flag", 0);
+                .eq("del_flag", ResourceEntityDelFlag.NORMAL.getFlag());
         List<AttrEntity> attrEntities = attrDao.selectList(wrapper);
         resourceDTO.setInfoList(attrEntities == null ? new ArrayList<>() : attrEntities); // npe?
         return resourceDTO;
@@ -189,7 +185,7 @@ public class ResourceServiceImpl extends CrudServiceImpl<ResourceDao, ResourceEn
     public List<AttrEntity> selectAttrsByResourceId(Long resourceId) {
         QueryWrapper<AttrEntity> wrapper = new QueryWrapper<>();
         wrapper.eq("data_resource_id", resourceId)
-                .eq("del_flag", 0)
+                .eq("del_flag", ResourceEntityDelFlag.NORMAL.getFlag())
                 .orderByDesc("attr_type");
         return attrDao.selectList(wrapper);
     }
@@ -212,7 +208,7 @@ public class ResourceServiceImpl extends CrudServiceImpl<ResourceDao, ResourceEn
         QueryWrapper<ResourceEntity> queryWrapper = new QueryWrapper<>();
         queryWrapper.orderByDesc("create_date")
                 .eq(StringUtils.isNotBlank(jsonObject.getString("type")), "type", jsonObject.getString("type"))
-                .eq("del_flag", 0);
+                .eq("del_flag", ResourceEntityDelFlag.NORMAL.getFlag());
         IPage<ResourceEntity> entityIPage = resourceDao.selectPage(page, queryWrapper);
         return entityIPage;
 
@@ -225,7 +221,7 @@ public class ResourceServiceImpl extends CrudServiceImpl<ResourceDao, ResourceEn
         List<ResourceDTO> resourceDTOS = resourceDao.selectMostPopular(selectMap);
         page.setRecords(resourceDTOS);
         QueryWrapper<ResourceEntity> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("del_flag", 0).eq("type", jsonObject.getString("type"));
+        queryWrapper.eq("del_flag", ResourceEntityDelFlag.NORMAL.getFlag()).eq("type", jsonObject.getString("type"));
         Integer count = resourceDao.selectCount(queryWrapper);
         page.setTotal(count);
         return page;
@@ -239,7 +235,7 @@ public class ResourceServiceImpl extends CrudServiceImpl<ResourceDao, ResourceEn
         UpdateWrapper<ResourceEntity> updateWrapper = new UpdateWrapper<>();
         updateWrapper.lambda()
                 .eq(ResourceEntity::getId, resourceEntity.getId())
-                .eq(ResourceEntity::getDelFlag, 0);
+                .eq(ResourceEntity::getDelFlag, ResourceEntityDelFlag.NORMAL.getFlag());
         resourceDao.update(entity, updateWrapper);
     }
 
@@ -255,4 +251,10 @@ public class ResourceServiceImpl extends CrudServiceImpl<ResourceDao, ResourceEn
         }
         return null;
     }
+
+    @Override
+    public List<Map<String, Object>> getAmountGroupByType() {
+        List<Map<String, Object>> amountInfo = resourceDao.getAmountGroupByType();
+        return amountInfo;
+    }
 }

renren-admin/src/main/java/io/renren/modules/resourceMountApply/dto/TResourceUndercarriageApplyDTO.java

@@ -0,0 +1,27 @@
+package io.renren.modules.resourceMountApply.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+import java.util.Map;
+
+
+@Data
+@ApiModel(value = "资源下架申请表单")
+public class TResourceUndercarriageApplyDTO implements Serializable {
+    @ApiModelProperty(value = "下架申请人id")
+    private String userId;
+    @ApiModelProperty(value = "下架申请人名字")
+    private String userName;
+    @ApiModelProperty(value = "下架申请人电话")
+    private String phone;
+    @ApiModelProperty(value = "下架申请人部门")
+    private String deptId;
+    @ApiModelProperty(value = "待下架的资源 id、资源名称 键值对")
+    private List<Map<String, String>> resource;
+    @ApiModelProperty(value = "下架原因")
+    private String reason;
+}

renren-admin/src/main/java/io/renren/modules/resourceMountApply/listener/ResourceOwnerListener.java

@@ -3,7 +3,6 @@ package io.renren.modules.resourceMountApply.listener;
 import com.alibaba.fastjson.JSONObject;
 import com.google.gson.Gson;
 import com.google.gson.JsonElement;
-import io.renren.modules.activiti.service.ActTaskService;
 import io.renren.modules.processForm.service.ApiGatewayService;
 import io.renren.modules.resource.dto.ResourceDTO;
 import io.renren.modules.resource.service.ResourceService;
@@ -128,7 +127,7 @@ public class ResourceOwnerListener implements TaskListener, ExecutionListener, A
     }
 
     /**
-     * 流程结束，接口推送api
+     * 流程结束，推送
      *
      * @param delegateTask
      */
@@ -138,10 +137,7 @@ public class ResourceOwnerListener implements TaskListener, ExecutionListener, A
         JsonElement jsonElement = gson.toJsonTree(kv);
         TResourceMountApplyDTO resourceMountApplyDTO = gson.fromJson(jsonElement, TResourceMountApplyDTO.class);
         Long resourceID = resourceMountApplyDTO.getResourceDTO().getId();
-
+//        apiGatewayService.registerApi2Gateway(String.valueOf(resourceID));
-        if (ActTaskService.Task_HANDLE_STATE_AGREE.equals(kv.get(ActTaskService.Task_HANDLE_STATE))) {
-            apiGatewayService.registerApi2Gateway(String.valueOf(resourceID));
-        }
 
         ResourceDTO re = resourceMountApplyDTO.getResourceDTO();
         if (re != null) {

renren-admin/src/main/java/io/renren/modules/security/config/ShiroConfig.java

@@ -82,6 +82,7 @@ public class ShiroConfig {
          */
         filterMap.put("/upload", "anon");
         filterMap.put("/upload/**", "anon");
+        filterMap.put("/census/center/**", "anon"); // 全局各类统计
 
         filterMap.put("/**", "oauth2");
         shiroFilter.setFilterChainDefinitionMap(filterMap);

renren-admin/src/main/java/io/renren/modules/sys/dao/SysUserDao.java

@@ -39,4 +39,6 @@ public interface SysUserDao extends BaseDao<SysUserEntity> {
      * @return
      */
     SysUserEntity getByDeptIdAndRoleId(@Param("deptId") Long deptId, @Param("roleId") Long roleId);
+
+    Long countAllUser();
 }

renren-admin/src/main/java/io/renren/modules/sys/service/SysUserService.java

@@ -48,4 +48,11 @@ public interface SysUserService extends BaseService<SysUserEntity> {
 
     SysUserDTO getByDeptIdAndRoleId(Long deptId, Long roleId);
 
+    /**
+     * 统计所有有效的用户
+     *
+     * @return
+     */
+    Long countAllUser();
+
 }

renren-admin/src/main/java/io/renren/modules/sys/service/impl/SysUserServiceImpl.java

@@ -167,4 +167,14 @@ public class SysUserServiceImpl extends BaseServiceImpl<SysUserDao, SysUserEntit
         return ConvertUtils.sourceToTarget(entity, SysUserDTO.class);
     }
 
+    /**
+     * 统计所有有效的用户
+     *
+     * @return
+     */
+    @Override
+    public Long countAllUser() {
+        return baseDao.countAllUser();
+    }
+
 }

renren-admin/src/main/resources/application.yml

@@ -2,6 +2,9 @@
 big_date:
   name: 青岛市大数据发展管理局
   assignee_role_name: 部门审批人
+# 需要进行统计数目的资源 type
+census:
+  type: 组件服务,应用资源,基础设施,数据资源,知识库
 # Tomcat
 server:
   tomcat:

renren-admin/src/main/resources/mapper/resource/ResourceDao.xml

@@ -89,7 +89,7 @@
         SET del_flag = 1,
         update_date = NOW()
         WHERE 1 = 1
-          AND id IN
+        AND id IN
         <foreach collection="ids" item="item" open="(" separator="," close=")">
             #{item}
         </foreach>
@@ -104,14 +104,19 @@
         IFNULL(trc.collectCount, 0) AS "collectCount",
         IFNULL(sd.name, '暂无部门信息') AS "deptName",
         IFNULL(trc2.isCollect, 'false') AS "isCollect",
-        (IFNULL(tdr.visits / 100, 0) + IFNULL(trs.score, 0) + IFNULL(taa.applyCount, 0)+ IFNULL(trc.collectCount, 0)) AS total
+        (IFNULL(tdr.visits / 100, 0) + IFNULL(trs.score, 0) + IFNULL(taa.applyCount, 0)+ IFNULL(trc.collectCount, 0)) AS
+        total
         FROM
         tb_data_resource tdr
         LEFT JOIN tb_data_attr tda ON tdr.id = tda.data_resource_id
-        LEFT JOIN ( SELECT resource_id, AVG(score) AS "score" FROM tb_resource_score WHERE 1 = 1 AND del_flag = 0 GROUP BY resource_id ) trs ON tdr.id = trs.resource_id
+        LEFT JOIN ( SELECT resource_id, AVG(score) AS "score" FROM tb_resource_score WHERE 1 = 1 AND del_flag = 0 GROUP
-        LEFT JOIN ( SELECT resource_id, COUNT(id) AS "applyCount" FROM t_ability_application WHERE 1 = 1 AND del_flag = 0 GROUP BY resource_id ) taa ON tdr.id = taa.resource_id
+        BY resource_id ) trs ON tdr.id = trs.resource_id
-        LEFT JOIN ( SELECT resource_id, COUNT(id) AS "collectCount" FROM tb_resource_collection WHERE 1 = 1 AND del_flag = 0 GROUP BY resource_id ) trc ON tdr.id = trc.resource_id
+        LEFT JOIN ( SELECT resource_id, COUNT(id) AS "applyCount" FROM t_ability_application WHERE 1 = 1 AND del_flag =
-        LEFT JOIN ( SELECT resource_id, user_id, ( CASE COUNT( id ) WHEN 1 THEN 'true' ELSE 'false' END ) AS "isCollect" FROM tb_resource_collection WHERE
+        0 GROUP BY resource_id ) taa ON tdr.id = taa.resource_id
+        LEFT JOIN ( SELECT resource_id, COUNT(id) AS "collectCount" FROM tb_resource_collection WHERE 1 = 1 AND del_flag
+        = 0 GROUP BY resource_id ) trc ON tdr.id = trc.resource_id
+        LEFT JOIN ( SELECT resource_id, user_id, ( CASE COUNT( id ) WHEN 1 THEN 'true' ELSE 'false' END ) AS "isCollect"
+        FROM tb_resource_collection WHERE
         1 = 1
         AND del_flag = 0
         AND user_id = #{dto.creator}
@@ -121,18 +126,18 @@
         WHERE 1 = 1
         AND tdr.type = #{dto.type}
         AND tdr.del_flag = 0
-        <if test="dto.name != null and dto.name != ''" >
+        <if test="dto.name != null and dto.name != ''">
             AND tdr.name like CONCAT('%',#{dto.name},'%')
         </if>
-        <if test="dto.districtId != null and dto.districtId != ''" >
+        <if test="dto.districtId != null and dto.districtId != ''">
-            AND tdr.district_id  = #{dto.districtId}
+            AND tdr.district_id = #{dto.districtId}
         </if>
-        <if test="dto.deptId != null and dto.deptId != ''" >
+        <if test="dto.deptId != null and dto.deptId != ''">
-            AND tdr.dept_id  = #{dto.deptId}
+            AND tdr.dept_id = #{dto.deptId}
         </if>
         <if test="dto.infoList.size > 0">
             AND
-            tda.data_resource_id  IN (
+            tda.data_resource_id IN (
             SELECT data_resource_id
             FROM (
             SELECT tb.data_resource_id
@@ -153,102 +158,115 @@
 
     <select id="selectTypeCount" resultType="java.util.Map">
         SELECT
-            type,
+        type,
-            count(id) AS "count"
+        count(id) AS "count"
         FROM tb_data_resource
         WHERE 1 = 1
-          AND del_flag = 0
+        AND del_flag = 0
-          <if test="deptId != null and deptId != ''">
+        <if test="deptId != null and deptId != ''">
             AND dept_id = #{deptId}
-          </if>
+        </if>
         GROUP BY type
         ORDER BY type
     </select>
 
     <select id="selectMostPopular" resultType="io.renren.modules.resource.dto.ResourceDTO">
         SELECT
-            tdr.*,
+        tdr.*,
-            IFNULL(trs.score, 0 ) AS "score",
+        IFNULL(trs.score, 0 ) AS "score",
-            IFNULL(taa.applyCount, 0 ) AS "applyCount",
+        IFNULL(taa.applyCount, 0 ) AS "applyCount",
-            IFNULL(trc.collectCount, 0) AS "collectCount",
+        IFNULL(trc.collectCount, 0) AS "collectCount",
-            (IFNULL(visits / 100, 0) + IFNULL(trs.score, 0) + IFNULL(applyCount,0)+ IFNULL(collectCount,0)) AS total
+        (IFNULL(visits / 100, 0) + IFNULL(trs.score, 0) + IFNULL(applyCount,0)+ IFNULL(collectCount,0)) AS total
         FROM
-            tb_data_resource tdr
+        tb_data_resource tdr
-                LEFT JOIN ( SELECT resource_id, SUM(score) AS "score" FROM tb_resource_score WHERE 1 = 1 AND del_flag = 0 GROUP BY resource_id ) trs ON tdr.id = trs.resource_id
+        LEFT JOIN ( SELECT resource_id, SUM(score) AS "score" FROM tb_resource_score WHERE 1 = 1 AND del_flag = 0 GROUP
-                LEFT JOIN ( SELECT resource_id, COUNT(id) AS "applyCount" FROM t_ability_application WHERE 1 = 1 AND del_flag = 0 GROUP BY resource_id ) taa ON tdr.id = taa.resource_id
+        BY resource_id ) trs ON tdr.id = trs.resource_id
-                LEFT JOIN ( SELECT resource_id, COUNT(id) AS "collectCount" FROM tb_resource_collection WHERE 1 = 1 AND del_flag = 0 GROUP BY resource_id ) trc ON tdr.id = trc.resource_id
+        LEFT JOIN ( SELECT resource_id, COUNT(id) AS "applyCount" FROM t_ability_application WHERE 1 = 1 AND del_flag =
+        0 GROUP BY resource_id ) taa ON tdr.id = taa.resource_id
+        LEFT JOIN ( SELECT resource_id, COUNT(id) AS "collectCount" FROM tb_resource_collection WHERE 1 = 1 AND del_flag
+        = 0 GROUP BY resource_id ) trc ON tdr.id = trc.resource_id
         WHERE
-            1 = 1
+        1 = 1
-          AND tdr.del_flag = 0
+        AND tdr.del_flag = 0
-          <if test="type != null and type != ''">
+        <if test="type != null and type != ''">
-              AND tdr.type = #{type}
+            AND tdr.type = #{type}
-          </if>
+        </if>
-          <if test="name != null and name != ''">
+        <if test="name != null and name != ''">
-              AND tdr.name LIKE CONCAT('%',#{name},'%')
+            AND tdr.name LIKE CONCAT('%',#{name},'%')
-          </if>
+        </if>
         ORDER BY ${orderFiled} ${orderType}
         LIMIT ${pageNum}, ${pageSize}
     </select>
 
     <select id="selectDTOById" resultMap="resourceDTO">
         SELECT
-            tdr.*,
+        tdr.*,
-            tda.*,
+        tda.*,
-            IFNULL(trs.score, 0 ) AS "score",
+        IFNULL(trs.score, 0 ) AS "score",
-            IFNULL(taa.applyCount, 0 ) AS "applyCount",
+        IFNULL(taa.applyCount, 0 ) AS "applyCount",
-            IFNULL(trc.collectCount, 0) AS "collectCount",
+        IFNULL(trc.collectCount, 0) AS "collectCount",
-            sd.name as "deptName",
+        sd.name as "deptName",
-            IFNULL(trc2.isCollect, 'false') AS "isCollect",
+        IFNULL(trc2.isCollect, 'false') AS "isCollect",
-            IFNULL(taa2.applyState, 'false') AS "applyState"
+        IFNULL(taa2.applyState, 'false') AS "applyState"
         FROM
-            tb_data_resource tdr
+        tb_data_resource tdr
-                LEFT JOIN tb_data_attr tda ON tdr.id = tda.data_resource_id
+        LEFT JOIN tb_data_attr tda ON tdr.id = tda.data_resource_id
-                LEFT JOIN ( SELECT resource_id, AVG(score) AS "score" FROM tb_resource_score WHERE 1 = 1 AND del_flag = 0 GROUP BY resource_id ) trs ON tdr.id = trs.resource_id
+        LEFT JOIN ( SELECT resource_id, AVG(score) AS "score" FROM tb_resource_score WHERE 1 = 1 AND del_flag = 0 GROUP
-                LEFT JOIN ( SELECT resource_id, COUNT(id) AS "applyCount" FROM t_ability_application WHERE 1 = 1 AND del_flag = 0 GROUP BY resource_id ) taa ON tdr.id = taa.resource_id
+        BY resource_id ) trs ON tdr.id = trs.resource_id
-                LEFT JOIN ( SELECT resource_id, COUNT(id) AS "collectCount" FROM tb_resource_collection WHERE 1 = 1 AND del_flag = 0 GROUP BY resource_id ) trc ON tdr.id = trc.resource_id
+        LEFT JOIN ( SELECT resource_id, COUNT(id) AS "applyCount" FROM t_ability_application WHERE 1 = 1 AND del_flag =
-                LEFT JOIN ( SELECT resource_id, user_id, ( CASE COUNT( id ) WHEN 1 THEN 'true' ELSE 'false' END ) AS "isCollect" FROM tb_resource_collection WHERE
+        0 GROUP BY resource_id ) taa ON tdr.id = taa.resource_id
-                            1 = 1 AND del_flag = 0 AND user_id = #{userId}
+        LEFT JOIN ( SELECT resource_id, COUNT(id) AS "collectCount" FROM tb_resource_collection WHERE 1 = 1 AND del_flag
-                            GROUP BY resource_id) trc2 ON tdr.id = trc2.resource_id
+        = 0 GROUP BY resource_id ) trc ON tdr.id = trc.resource_id
-                LEFT JOIN ( SELECT resource_id, user_id, ( CASE approve_status WHEN '通过' THEN 'true' ELSE 'false' END ) AS "applyState" FROM t_ability_application WHERE
+        LEFT JOIN ( SELECT resource_id, user_id, ( CASE COUNT( id ) WHEN 1 THEN 'true' ELSE 'false' END ) AS "isCollect"
-                            1 = 1 AND del_flag = 0 AND user_id = #{userId}
+        FROM tb_resource_collection WHERE
-                            GROUP BY id) taa2 ON tdr.id = taa2.resource_id
+        1 = 1 AND del_flag = 0 AND user_id = #{userId}
-                LEFT JOIN sys_dept sd ON tdr.dept_id = sd.id
+        GROUP BY resource_id) trc2 ON tdr.id = trc2.resource_id
+        LEFT JOIN ( SELECT resource_id, user_id, ( CASE approve_status WHEN '通过' THEN 'true' ELSE 'false' END ) AS
+        "applyState" FROM t_ability_application WHERE
+        1 = 1 AND del_flag = 0 AND user_id = #{userId}
+        GROUP BY id) taa2 ON tdr.id = taa2.resource_id
+        LEFT JOIN sys_dept sd ON tdr.dept_id = sd.id
         WHERE 1 = 1
-          AND tdr.del_flag = 0
+        <!--          AND tdr.del_flag = 0-->
-          AND tdr.id = #{id}
+        AND tdr.id = #{id}
     </select>
 
     <select id="selectDTOPage" resultType="io.renren.modules.resource.dto.ResourceDTO">
         SELECT
-            tdr.*,
+        tdr.*,
-            IFNULL(trs.score, 0 ) AS "score",
+        IFNULL(trs.score, 0 ) AS "score",
-            IFNULL(taa.applyCount, 0 ) AS "applyCount",
+        IFNULL(taa.applyCount, 0 ) AS "applyCount",
-            IFNULL(trc.collectCount, 0) AS "collectCount",
+        IFNULL(trc.collectCount, 0) AS "collectCount",
-            sd.name AS "deptName",
+        sd.name AS "deptName",
-            IFNULL(trc2.isCollect, 'false') AS "isCollect",
+        IFNULL(trc2.isCollect, 'false') AS "isCollect",
-            IFNULL(taa2.applyState, 'false') AS "applyState",
+        IFNULL(taa2.applyState, 'false') AS "applyState",
         (IFNULL(visits / 100, 0) + IFNULL(trs.score, 0) + IFNULL(applyCount,0)+ IFNULL(collectCount,0)) AS total
         FROM
-            tb_data_resource tdr
+        tb_data_resource tdr
-                LEFT JOIN ( SELECT resource_id, AVG(score) AS "score" FROM tb_resource_score WHERE 1 = 1 AND del_flag = 0 GROUP BY resource_id ) trs ON tdr.id = trs.resource_id
+        LEFT JOIN ( SELECT resource_id, AVG(score) AS "score" FROM tb_resource_score WHERE 1 = 1 AND del_flag = 0 GROUP
-                LEFT JOIN ( SELECT resource_id, COUNT(id) AS "applyCount" FROM t_ability_application WHERE 1 = 1 AND del_flag = 0 GROUP BY resource_id ) taa ON tdr.id = taa.resource_id
+        BY resource_id ) trs ON tdr.id = trs.resource_id
-                LEFT JOIN ( SELECT resource_id, COUNT(id) AS "collectCount" FROM tb_resource_collection WHERE 1 = 1 AND del_flag = 0 GROUP BY resource_id ) trc ON tdr.id = trc.resource_id
+        LEFT JOIN ( SELECT resource_id, COUNT(id) AS "applyCount" FROM t_ability_application WHERE 1 = 1 AND del_flag =
-                LEFT JOIN ( SELECT resource_id, user_id, ( CASE COUNT( id ) WHEN 1 THEN 'true' ELSE 'false' END ) AS "isCollect" FROM tb_resource_collection WHERE
+        0 GROUP BY resource_id ) taa ON tdr.id = taa.resource_id
-                1 = 1 AND del_flag = 0 AND user_id = #{dto.creator}
+        LEFT JOIN ( SELECT resource_id, COUNT(id) AS "collectCount" FROM tb_resource_collection WHERE 1 = 1 AND del_flag
-                            GROUP BY resource_id) trc2 ON tdr.id = trc2.resource_id
+        = 0 GROUP BY resource_id ) trc ON tdr.id = trc.resource_id
-                LEFT JOIN ( SELECT resource_id, user_id, ( CASE approve_status WHEN '通过' THEN 'true' ELSE 'false' END ) AS "applyState" FROM t_ability_application WHERE
+        LEFT JOIN ( SELECT resource_id, user_id, ( CASE COUNT( id ) WHEN 1 THEN 'true' ELSE 'false' END ) AS "isCollect"
-                1 = 1 AND del_flag = 0 AND user_id = #{dto.creator}
+        FROM tb_resource_collection WHERE
-                            GROUP BY id) taa2 ON tdr.id = taa2.resource_id
+        1 = 1 AND del_flag = 0 AND user_id = #{dto.creator}
-                LEFT JOIN sys_dept sd ON tdr.dept_id = sd.id
+        GROUP BY resource_id) trc2 ON tdr.id = trc2.resource_id
+        LEFT JOIN ( SELECT resource_id, user_id, ( CASE approve_status WHEN '通过' THEN 'true' ELSE 'false' END ) AS
+        "applyState" FROM t_ability_application WHERE
+        1 = 1 AND del_flag = 0 AND user_id = #{dto.creator}
+        GROUP BY id) taa2 ON tdr.id = taa2.resource_id
+        LEFT JOIN sys_dept sd ON tdr.dept_id = sd.id
         WHERE 1 = 1
-          AND tdr.del_flag = 0
+        AND tdr.del_flag = 0
-        <if test="dto.name != null and dto.name != ''" >
+        <if test="dto.name != null and dto.name != ''">
             AND tdr.name LIKE CONCAT('%',#{dto.name},'%')
         </if>
-        <if test="dto.type != null and dto.type != ''" >
+        <if test="dto.type != null and dto.type != ''">
             AND tdr.type = #{dto.type}
         </if>
-        <if test="dto.districtId != null and dto.districtId != ''" >
+        <if test="dto.districtId != null and dto.districtId != ''">
             AND tdr.district_id = #{dto.districtId}
         </if>
         ORDER BY ${orderField} ${orderType}
@@ -257,35 +275,47 @@
 
     <select id="selectApplyArea" resultType="java.util.Map">
         SELECT
-            *
+        *
         FROM
-            (
+        (
-                SELECT
+        SELECT
-                    attr_value,
+        attr_value,
-                    IFNULL( COUNT( trc.id ), 0 ) AS "colCount",
+        IFNULL( COUNT( trc.id ), 0 ) AS "colCount",
-                    IFNULL( COUNT( taa.id ), 0 ) AS "aplCount",
+        IFNULL( COUNT( taa.id ), 0 ) AS "aplCount",
-                    (
+        (
-                        IFNULL( COUNT( trc.id ), 0 ) + IFNULL( COUNT( taa.id ), 0 )) AS total
+        IFNULL( COUNT( trc.id ), 0 ) + IFNULL( COUNT( taa.id ), 0 )) AS total
-                FROM
+        FROM
-                    tb_data_attr tda
+        tb_data_attr tda
-                        LEFT JOIN tb_resource_collection trc ON tda.data_resource_id = trc.resource_id
+        LEFT JOIN tb_resource_collection trc ON tda.data_resource_id = trc.resource_id
-                        AND trc.del_flag = 0
+        AND trc.del_flag = 0
-                        AND trc.user_id = #{userId}
+        AND trc.user_id = #{userId}
-                        LEFT JOIN t_ability_application taa ON tda.data_resource_id = taa.resource_id
+        LEFT JOIN t_ability_application taa ON tda.data_resource_id = taa.resource_id
-                        AND taa.del_flag = 0
+        AND taa.del_flag = 0
-                        AND taa.user_id = #{userId}
+        AND taa.user_id = #{userId}
 
-                WHERE
-                    1 = 1
-                  AND tda.attr_type = '应用领域'
-                  AND tda.del_flag = 0
-                  AND ( attr_value != '' AND attr_value IS NOT NULL )
-                GROUP BY
-                    attr_value
-                ORDER BY
-                    total DESC
-            ) temp
         WHERE
-            temp.total != 0
+        1 = 1
+        AND tda.attr_type = '应用领域'
+        AND tda.del_flag = 0
+        AND ( attr_value != '' AND attr_value IS NOT NULL )
+        GROUP BY
+        attr_value
+        ORDER BY
+        total DESC
+        ) temp
+        WHERE
+        temp.total != 0
+    </select>
+
+    <select id="getAmountGroupByType" resultType="java.util.Map">
+        SELECT
+        COUNT( id ) AS amount,
+        type AS type
+        FROM
+        tb_data_resource
+        WHERE
+        del_flag = 0
+        GROUP BY
+        type
     </select>
 </mapper>

renren-admin/src/main/resources/mapper/resourceCar/ResourceCarDao.xml

@@ -45,7 +45,7 @@
     select trc.*
     from tb_resource_car trc
         <if test="(params.type != null and params.type != '') or (params.name != null and params.name != '')">
-            left join tb_data_resource tdr on trc.resource_id = tdr.id and tdr.del_flag = 0
+            left join tb_data_resource tdr on trc.resource_id = tdr.id and tdr.del_flag != 1
         </if>
     where 1 = 1
       and trc.del_flag = 0

renren-admin/src/main/resources/mapper/resourceCollection/ResourceCollectionDao.xml

@@ -57,7 +57,7 @@
         SELECT trc.*
         FROM tb_resource_collection trc
         <if test="(params.type != null and params.type != '') or (params.name != null and params.name != '')">
-            LEFT JOIN tb_data_resource tdr ON trc.resource_id = tdr.id AND tdr.del_flag = 0
+            LEFT JOIN tb_data_resource tdr ON trc.resource_id = tdr.id AND tdr.del_flag != 1
         </if>
         WHERE 1 = 1
         AND trc.del_flag = 0

renren-admin/src/main/resources/mapper/sys/SysUserDao.xml

@@ -6,10 +6,10 @@
     <select id="getList" resultType="io.renren.modules.sys.entity.SysUserEntity">
         select t1.*, (select t2.name from sys_dept t2 where t2.id=t1.dept_id) deptName
         from sys_user t1
-        <if test = "postId != null and postId.trim() != '' ">
+        <if test="postId != null and postId.trim() != '' ">
             left join sys_user_post t3 on t1.id = t3.user_id
         </if>
-        where  t1.super_admin = 0
+        where t1.super_admin = 0
         <if test="username != null and username.trim() != ''">
             and t1.username like #{username}
         </if>
@@ -65,5 +65,13 @@
         AND t2.dept_id = #{deptId}
         LIMIT 1
     </select>
+    <select id="countAllUser" resultType="java.lang.Long">
+        SELECT
+        COUNT( id )
+        FROM
+        sys_user
+        WHERE
+        `status` = 1
+    </select>
 
 </mapper>