生产调度概览修改，报警工单生产接口

operation_manager/src/main/java/com/huaxu/config/ResourceServerConfig.java

@@ -18,6 +18,7 @@ public class ResourceServerConfig extends ResourceServerConfigurerAdapter {
                 .authorizeRequests()
                 .antMatchers("/swagger-ui.html","/webjars/**", "/webjars/**", "/swagger-resources/**",
                        "/webSocket/**","/message/sendToOne","/messageTemplate/**","/messageType/**",
+                        "/order/workOrderManage/saveByAlarms",
                         "/v2/**")
                 .permitAll() //配置不需要身份认证的请求路径
                // .anyRequest().authenticated() //其他所有访问路径都需要身份认证

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

@@ -1,5 +1,6 @@
 package com.huaxu.order.dao;
 
+import com.huaxu.order.dto.WorkOrderManageByAlarmDto;
 import com.huaxu.order.dto.WorkOrderManageDto;
 import com.huaxu.order.entity.WorkOrderManage;
 import org.apache.ibatis.annotations.Mapper;
@@ -26,4 +27,6 @@ public interface WorkOrderManageMapper {
     List<WorkOrderManageDto> selectAppAll( @Param("userId")Integer userId,@Param("tenantId")String tenantId);
 
     List<WorkOrderManageDto> selectOrderDetail(Integer id);
+
+    int batchInsertByAlarms(@Param("workOrderManages")List<WorkOrderManageByAlarmDto> workOrderManages);
 }

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

@@ -0,0 +1,45 @@
+package com.huaxu.order.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+@ApiModel(value = "报警信息生成的工单信息")
+@Data
+public class WorkOrderManageByAlarmDto implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "报警信息id")
+    private Long id;
+
+    @ApiModelProperty(value = "报警信息id")
+    private Long alarmId;
+
+    @ApiModelProperty(value = "设备id")
+    private Long deviceId;
+
+    @ApiModelProperty(value = "租户id")
+    private String tenantId;
+
+    @ApiModelProperty(value = "工单描述")
+    private String taskDesc;
+
+    @ApiModelProperty(value = "地址")
+    private String address;
+
+    @ApiModelProperty(value = "报警时间")
+    private String orderTime;
+
+    @ApiModelProperty(value = "公司机构id")
+    private String companyOrgId;
+
+    @ApiModelProperty(value = "部门机构id")
+    private String departmentOrgId;
+
+    @ApiModelProperty(value = "经纬度")
+    private String geo;
+
+}

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

@@ -1,6 +1,7 @@
 package com.huaxu.order.service;
 
 
+import com.huaxu.order.dto.WorkOrderManageByAlarmDto;
 import com.huaxu.order.dto.WorkOrderManageDto;
 import com.huaxu.order.entity.WorkOrderManage;
 import com.huaxu.task.entity.PlanManage;
@@ -37,4 +38,8 @@ public interface WorkOrderManageService {
      */
     List<WorkOrderManageDto> selectOrderDetail(Integer id);
 
+    /**
+     * 批量插入工单信息（报警生成的）
+     */
+    Integer batchInsertByAlarms(List<WorkOrderManageByAlarmDto> workOrderManages);
 }

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

@@ -2,6 +2,7 @@ package com.huaxu.order.service.impl;
 
 import com.huaxu.model.LoginUser;
 import com.huaxu.order.dao.WorkOrderManageMapper;
+import com.huaxu.order.dto.WorkOrderManageByAlarmDto;
 import com.huaxu.order.dto.WorkOrderManageDto;
 import com.huaxu.order.entity.WorkOrderManage;
 import com.huaxu.order.service.WorkOrderManageService;
@@ -74,4 +75,11 @@ public class WorkOrderManageServiceImpl implements WorkOrderManageService {
     public List<WorkOrderManageDto> selectOrderDetail(Integer id) {
         return workOrderManageMapper.selectOrderDetail(id);
     }
+    /**
+     * 批量插入工单信息（报警生成的）
+     */
+    @Override
+    public Integer batchInsertByAlarms(List<WorkOrderManageByAlarmDto> workOrderManages) {
+        return workOrderManageMapper.batchInsertByAlarms(workOrderManages);
+    }
 }

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

@@ -454,4 +454,12 @@
     where t1.id = #{id,jdbcType=INTEGER} or t1.order_pid = #{orderPid,jdbcType=INTEGER}
     order by t1.order_pid
   </select>
+
+  <insert id="batchInsertByAlarms" parameterType="com.huaxu.order.entity.WorkOrderManage" keyProperty="id" useGeneratedKeys="true">
+  insert into sc_work_order_manage( task_no, task_desc, address, order_time, company_org_id, department_org_id, order_status, event_type, order_pid, tenant_id, current_task_name, create_by,  date_create, update_by, date_update, geo)
+ values
+  <foreach collection="workOrderManages" item="item" index="index" separator=",">
+    (CONCAT(DATE_FORMAT(now(), '%Y%m%d%H%i%s'),FLOOR(RAND()*8999)+1000) , #{item.taskDesc}, #{item.address}, #{item.orderTime}, #{item.companyOrgId}, #{item.departmentOrgId}, 0, 3, 0, #{item.tenantId}, '设备报警工单', 'system',  now(), 'system', now(), #{item.geo})
+  </foreach>
+  </insert>
 </mapper>

sms_water/src/main/resources/mapper/MonitorDataReportMapper.xml

@@ -881,7 +881,7 @@
 
     <!-- 概览页 -->
     <select id="selectDeviceCode" resultType="java.lang.String">
-        select DEVICE_CODE from sms_device
+        select DEVICE_CODE from sms_device d
         where STATUS =1 and ENABLE_STATE =1  and TENANT_ID=#{tenantId}
         <if test="userType!=null and userType!=-999 and userType!=-9999 and  programItems != null and programItems.size() > 0">
             <if test="permissonType == 5 or permissonType == 2">