Merge remote-tracking branch 'origin/master'

gateway/src/main/java/com/huaxu/gateway/config/SwaggerProvider.java

@@ -31,6 +31,7 @@ public class SwaggerProvider implements SwaggerResourcesProvider {
         resources.add(swaggerResource("用户服务接口", "/user-auth/v2/api-docs?group=api"));
         resources.add(swaggerResource("用户管理接口", "/user-center/v2/api-docs?group=api"));
         resources.add(swaggerResource("调度中心接口", "/sms-water/v2/api-docs?group=api"));
+        resources.add(swaggerResource("运维管理接口", "/operation-manager/v2/api-docs?group=api"));
         return resources;
     }
 

gateway/src/main/resources/application-dev.properties

@@ -37,6 +37,10 @@ spring.cloud.gateway.routes[4].uri=lb:ws://uims-message
 spring.cloud.gateway.routes[4].predicates[0]=Path=/uims-message/webSocket/**
 spring.cloud.gateway.routes[4].filters[0]=StripPrefix=1
 
+spring.cloud.gateway.routes[5].id=operation-manager
+spring.cloud.gateway.routes[5].uri=lb://operation-manager
+spring.cloud.gateway.routes[5].predicates[0]=Path=/operation-manager/**
+spring.cloud.gateway.routes[5].filters[0]=StripPrefix=1
 
 spring.servlet.multipart.max-file-size=100MB
 spring.servlet.multipart.max-request-size=100MB

operation_manager/src/main/java/com/huaxu/order/controller/WorkOrderManageController.java

@@ -59,4 +59,22 @@ public class WorkOrderManageController {
         }
         return new AjaxMessage<>(ResultStatus.OK, result);
     }
+    /**
+     * APP运维管理待处理查询
+     * @return Response对象
+     */
+    @RequestMapping(value = "selectAppTodo", method = RequestMethod.POST)
+    @ApiOperation(value = "APP运维管理待处理查询")
+    public AjaxMessage<List<WorkOrderManageDto>> selectAppTodo() {
+        return new AjaxMessage<>(ResultStatus.OK,  workOrderManageService.selectAppTodo());
+    }
+    /**
+     * APP运维管理全部查询
+     * @return Response对象
+     */
+    @RequestMapping(value = "selectAppAll", method = RequestMethod.POST)
+    @ApiOperation(value = "APP运维管理全部查询")
+    public AjaxMessage<List<WorkOrderManageDto>> selectAppAll() {
+        return new AjaxMessage<>(ResultStatus.OK,  workOrderManageService.selectAppAll());
+    }
 }

operation_manager/src/main/java/com/huaxu/order/dao/WorkOrderManageMapper.java

@@ -1,7 +1,11 @@
 package com.huaxu.order.dao;
 
+import com.huaxu.order.dto.WorkOrderManageDto;
 import com.huaxu.order.entity.WorkOrderManage;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 @Mapper
 public interface WorkOrderManageMapper {
@@ -16,4 +20,8 @@ public interface WorkOrderManageMapper {
     int updateByPrimaryKeySelective(WorkOrderManage record);
 
     int updateByPrimaryKey(WorkOrderManage record);
+
+    List<WorkOrderManageDto> selectAppTodo( @Param("userId")Integer userId,@Param("tenantId")String tenantId);
+
+    List<WorkOrderManageDto> selectAppAll( @Param("userId")Integer userId,@Param("tenantId")String tenantId);
 }

operation_manager/src/main/java/com/huaxu/order/dto/WorkOrderManageDto.java

@@ -16,4 +16,7 @@ public class WorkOrderManageDto extends WorkOrderManage {
 
     @ApiModelProperty(value = "json格式存储对应任务详情")
     private String flowDetail;
+
+    @ApiModelProperty(value = "任务工单类型")
+    private String typeName;
 }

operation_manager/src/main/java/com/huaxu/order/service/WorkOrderManageService.java

@@ -1,10 +1,10 @@
 package com.huaxu.order.service;
 
 
+import com.huaxu.order.dto.WorkOrderManageDto;
 import com.huaxu.order.entity.WorkOrderManage;
 
 import java.util.List;
-import java.util.Set;
 
 
 public interface WorkOrderManageService {
@@ -15,4 +15,13 @@ public interface WorkOrderManageService {
      * @return 影响行数
      */
     int insertSelective(WorkOrderManage workOrderManage);
+    /**
+     * APP运维管理待处理
+     */
+    List<WorkOrderManageDto> selectAppTodo();
+    /**
+     * APP运维管理全部查询
+     */
+    List<WorkOrderManageDto> selectAppAll();
+
 }

operation_manager/src/main/java/com/huaxu/order/service/impl/WorkOrderManageServiceImpl.java

@@ -1,11 +1,16 @@
 package com.huaxu.order.service.impl;
 
+import com.huaxu.model.LoginUser;
 import com.huaxu.order.dao.WorkOrderManageMapper;
+import com.huaxu.order.dto.WorkOrderManageDto;
 import com.huaxu.order.entity.WorkOrderManage;
 import com.huaxu.order.service.WorkOrderManageService;
+import com.huaxu.util.UserUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 
 /**
  *
@@ -30,4 +35,21 @@ public class WorkOrderManageServiceImpl implements WorkOrderManageService {
     public int insertSelective(WorkOrderManage workOrderManage) {
         return workOrderManageMapper.insertSelective(workOrderManage);
     }
+
+    /**
+     * APP运维管理待处理
+     */
+    @Override
+    public List<WorkOrderManageDto> selectAppTodo() {
+        LoginUser currentUser = UserUtil.getCurrentUser();
+        return workOrderManageMapper.selectAppTodo(currentUser.getId(),currentUser.getTenantId());
+    }
+    /**
+     * APP运维管理全部查询
+     */
+    @Override
+    public List<WorkOrderManageDto> selectAppAll() {
+        LoginUser currentUser = UserUtil.getCurrentUser();
+        return workOrderManageMapper.selectAppAll(currentUser.getId(),currentUser.getTenantId());
+    }
 }

operation_manager/src/main/resources/mapper/order/WorkOrderManageMapper.xml

@@ -409,4 +409,30 @@
       geo = #{geo,jdbcType=VARCHAR}
     where id = #{id,jdbcType=INTEGER}
   </update>
+
+  <select id="selectAppTodo" resultMap="BaseResultMap">
+    select id,task_no,send_time,address,order_type_id
+    from sc_work_order_manage
+    where find_in_set(#{userId},current_users) and tenant_id = #{tenantId}
+    union
+    select id,plan_id,plan_start_date,task_area_name,task_type
+    from sc_plan_manage
+    where find_in_set(#{userId},current_users) and tenant_id = #{tenantId}
+    order by send_time
+  </select>
+
+  <select id="selectAppAll" resultMap="BaseResultMap">
+    select id,task_no,send_time,address,order_type_id,current_task_name
+    from sc_work_order_manage
+    where (find_in_set(#{userId},current_users)
+     or id in(select flow_id from sc_work_flow_log where flow_type=2 and find_in_set(#{userId},handle_user_id)))
+     and tenant_id = #{tenantId}
+    union
+    select id,plan_id,plan_start_date,task_area_name,task_type,current_task_name
+    from sc_plan_manage
+    where (find_in_set(#{userId},current_users)
+     or id in(select flow_id from sc_work_flow_log where flow_type=1 and find_in_set(#{userId},handle_user_id)))
+     and tenant_id = #{tenantId}
+    order by send_time
+  </select>
 </mapper>