后台接口功能处理

imcs-admin-boot/imcs-business-biz/pom.xml

@@ -127,7 +127,17 @@
             <artifactId>sshj</artifactId>
             <version>0.34.0</version>
         </dependency>
-
+        <!-- Apache HttpClient：提供连接池支持
+        <dependency>
+            <groupId>org.apache.httpcomponents.client5</groupId>
+            <artifactId>httpclient5</artifactId>
+            <version>5.3</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.httpcomponents.client5</groupId>
+            <artifactId>httpclient5-fluent</artifactId>
+            <version>5.3</version>
+        </dependency> -->
         <!--<dependency>-->
             <!--<groupId>com.matlab.tool</groupId>-->
             <!--<artifactId>javabuilder</artifactId>-->

imcs-admin-boot/imcs-business-biz/src/main/java/com/github/zuihou/business/productionReadyCenter/dao/DeviceRateLogMapper.java

@@ -0,0 +1,9 @@
+package com.github.zuihou.business.productionReadyCenter.dao;
+
+import com.github.zuihou.base.mapper.SuperMapper;
+import com.github.zuihou.business.productionReadyCenter.entity.DeviceRateLog;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface DeviceRateLogMapper extends SuperMapper<DeviceRateLog> {
+}

imcs-admin-boot/imcs-business-biz/src/main/java/com/github/zuihou/business/productionReadyCenter/dao/DeviceStatusLogMapper.java

@@ -0,0 +1,16 @@
+package com.github.zuihou.business.productionReadyCenter.dao;
+
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.github.zuihou.base.mapper.SuperMapper;
+import com.github.zuihou.business.productionReadyCenter.entity.DeviceStatusLog;
+import com.github.zuihou.database.mybatis.conditions.query.LbqWrapper;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
+
+import java.util.Map;
+
+@Repository
+public interface DeviceStatusLogMapper extends SuperMapper<DeviceStatusLog> {
+
+    Map<String, String> queryMachineEvent(@Param(Constants.WRAPPER) LbqWrapper<DeviceStatusLog> wrapper);
+}

imcs-admin-boot/imcs-business-biz/src/main/java/com/github/zuihou/business/productionReadyCenter/service/DeviceRateLogService.java

@@ -0,0 +1,7 @@
+package com.github.zuihou.business.productionReadyCenter.service;
+
+import com.github.zuihou.base.service.SuperService;
+import com.github.zuihou.business.productionReadyCenter.entity.DeviceRateLog;
+
+public interface DeviceRateLogService extends SuperService<DeviceRateLog> {
+}

imcs-admin-boot/imcs-business-biz/src/main/java/com/github/zuihou/business/productionReadyCenter/service/DeviceStatusLogService.java

@@ -0,0 +1,12 @@
+package com.github.zuihou.business.productionReadyCenter.service;
+
+import com.github.zuihou.base.service.SuperService;
+import com.github.zuihou.business.productionReadyCenter.entity.DeviceStatusLog;
+import com.github.zuihou.database.mybatis.conditions.query.LbqWrapper;
+
+import java.util.Map;
+
+public interface DeviceStatusLogService extends SuperService<DeviceStatusLog> {
+
+    Map<String,String> queryMachineEvent(LbqWrapper<DeviceStatusLog> wrapper);
+}

imcs-admin-boot/imcs-business-biz/src/main/java/com/github/zuihou/business/productionReadyCenter/service/impl/DeviceRateLogServiceImpl.java

@@ -0,0 +1,13 @@
+package com.github.zuihou.business.productionReadyCenter.service.impl;
+
+import com.github.zuihou.base.service.SuperServiceImpl;
+import com.github.zuihou.business.productionReadyCenter.dao.DeviceRateLogMapper;
+import com.github.zuihou.business.productionReadyCenter.entity.DeviceRateLog;
+import com.github.zuihou.business.productionReadyCenter.service.DeviceRateLogService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+@Slf4j
+@Service
+public class DeviceRateLogServiceImpl extends SuperServiceImpl<DeviceRateLogMapper, DeviceRateLog> implements DeviceRateLogService {
+}

imcs-admin-boot/imcs-business-biz/src/main/java/com/github/zuihou/business/productionReadyCenter/service/impl/DeviceStatusLogServiceImpl.java

@@ -0,0 +1,20 @@
+package com.github.zuihou.business.productionReadyCenter.service.impl;
+
+import com.github.zuihou.base.service.SuperServiceImpl;
+import com.github.zuihou.business.productionReadyCenter.dao.DeviceStatusLogMapper;
+import com.github.zuihou.business.productionReadyCenter.entity.DeviceStatusLog;
+import com.github.zuihou.business.productionReadyCenter.service.DeviceStatusLogService;
+import com.github.zuihou.database.mybatis.conditions.query.LbqWrapper;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+import java.util.Map;
+
+@Slf4j
+@Service
+public class DeviceStatusLogServiceImpl extends SuperServiceImpl<DeviceStatusLogMapper, DeviceStatusLog> implements DeviceStatusLogService {
+    @Override
+    public Map<String, String> queryMachineEvent(LbqWrapper<DeviceStatusLog> wrapper) {
+        return baseMapper.queryMachineEvent(wrapper);
+    }
+}

imcs-admin-boot/imcs-business-biz/src/main/java/com/github/zuihou/business/productionResourceCenter/service/impl/AsyncServiceImpl.java

@@ -213,8 +213,8 @@ public class AsyncServiceImpl implements AsyncService {
         List<Long> deviceIdList = Lists.newArrayList();
         //设备状态变化处理
          if(changeStatusList.size() > 0) {
-             Map<Long, List<DeviceStatusLog>> deviceMap = changeStatusList.stream().collect(Collectors.groupingBy(DeviceStatusLog::getResourceId));
-             deviceIdList.addAll(deviceMap.keySet());
+             changeStatusList.stream().forEach(item->item.setStatus(0));
+             deviceStatusLogService.updateBatchById(changeStatusList);
              //针对目标位是该机床设备进行局部重排产
              orderService.reschedulingPlanTasks();
          }else {

imcs-admin-boot/imcs-business-biz/src/main/resources/mapper_business/base/productionReadyCenter/DeviceStatusLogMapper.xml

@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.github.zuihou.business.productionReadyCenter.dao.DeviceStatusLogMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.github.zuihou.business.productionReadyCenter.entity.DeviceStatusLog">
+        <id column="id" jdbcType="BIGINT" property="id"/>
+        <result column="create_time" jdbcType="TIMESTAMP" property="createTime"/>
+        <result column="create_user" jdbcType="BIGINT" property="createUser"/>
+        <result column="update_time" jdbcType="TIMESTAMP" property="updateTime"/>
+        <result column="update_user" jdbcType="BIGINT" property="updateUser"/>
+        <result column="status" jdbcType="VARCHAR" property="status"/>
+        <result column="code" jdbcType="VARCHAR" property="code"/>
+        <result column="pre_status" jdbcType="VARCHAR" property="preStatus"/>
+        <result column="change_status" jdbcType="VARCHAR" property="changeStatus"/>
+        <result column="group_id" jdbcType="VARCHAR" property="groupId"/>
+        <result column="resource_id" jdbcType="VARCHAR" property="resourceId"/>
+        <result column="curr_date" jdbcType="VARCHAR" property="currDate"/>
+
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id,create_time,create_user,update_time,update_user,status,code,pre_status,change_status,group_id,resource_id,curr_date
+    </sql>
+
+
+    <select id="queryMachineEvent" resultType="map">
+        SELECT count(*) as cnt,
+               s.status,
+               s.code,
+               s.pre_status AS preStatus,
+               s.change_status AS changeStatus,
+               s.curr_date AS currDate
+        from (
+            SELECT * FROM imcs_device_status_log
+         ) s ${ew.customSqlSegment}
+    </select>
+
+</mapper>

imcs-admin-boot/imcs-business-controller/src/main/java/com/github/zuihou/business/controller/externalApi/ProductionTasksController.java

@@ -1,6 +1,7 @@
 package com.github.zuihou.business.controller.externalApi;
 
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.json.JSONUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
@@ -27,8 +28,12 @@ import com.github.zuihou.business.operationManagementCenter.dto.PlanPageDTO;
 import com.github.zuihou.business.operationManagementCenter.entity.*;
 import com.github.zuihou.business.operationManagementCenter.service.*;
 import com.github.zuihou.business.productionReadyCenter.entity.AAutoNodeLog;
+import com.github.zuihou.business.productionReadyCenter.entity.DeviceRateLog;
+import com.github.zuihou.business.productionReadyCenter.entity.DeviceStatusLog;
 import com.github.zuihou.business.productionReadyCenter.entity.MMeterial;
 import com.github.zuihou.business.productionReadyCenter.service.AAutoNodeLogService;
+import com.github.zuihou.business.productionReadyCenter.service.DeviceRateLogService;
+import com.github.zuihou.business.productionReadyCenter.service.DeviceStatusLogService;
 import com.github.zuihou.business.productionReadyCenter.service.MMeterialService;
 import com.github.zuihou.business.productionResourceCenter.entity.Productionresource;
 import com.github.zuihou.business.productionResourceCenter.entity.ZZone;
@@ -127,6 +132,12 @@ public class ProductionTasksController {
     @Autowired
     private ProductionresourceBizService productionresourceBizService;
 
+    @Autowired
+    private DeviceStatusLogService deviceStatusLogService;
+
+    @Autowired
+    private DeviceRateLogService deviceRateLogService;
+
 
     //MES->产线
     @ApiOperation(value = "任务下发通知接口", notes = "任务下发通知接口")
@@ -633,4 +644,49 @@ public class ProductionTasksController {
            }
           return instance;
     }
+
+    //MES->产线
+    @ApiOperation(value = "产线机床对应事件查询接口", notes = "产线机床对应事件查询接口")
+    @PostMapping("/deviceStatusLog/queryMachineEventDetail")
+    public R2 queryMachineEventDetail(@RequestBody Map<String, Object> map) {
+        BaseContextHandler.setTenant("0000");
+        Map params = (Map) map.get("model");
+        LbqWrapper<DeviceStatusLog> lbqWrapper = new LbqWrapper<DeviceStatusLog>();
+        lbqWrapper.eq(ObjectUtil.isNotEmpty(params.get("status")),DeviceStatusLog::getStatus, params.get("status").toString()).eq(ObjectUtil.isNotEmpty(params.get("date")),DeviceStatusLog::getCurrDate, params.get("date").toString())
+                .eq(ObjectUtil.isNotEmpty(params.get("code")),DeviceStatusLog::getCode, params.get("code"));
+        List<DeviceStatusLog> returnData = deviceStatusLogService.list(lbqWrapper);
+        return R2.success(returnData);
+    }
+
+    //MES->产线
+    @ApiOperation(value = "产线机床对应事件统计查询接口", notes = "产线机床对应事件统计查询接口")
+    @PostMapping("/deviceStatusLog/queryMachineEvent")
+    public R2 queryMachineEvent(@RequestBody Map<String, Object> map) {
+        BaseContextHandler.setTenant("0000");
+
+        Map params = (Map) map.get("model");
+        LbqWrapper<DeviceStatusLog> lbqWrapper = new LbqWrapper<DeviceStatusLog>();
+        lbqWrapper.eq(ObjectUtil.isNotEmpty(params.get("status")),DeviceStatusLog::getStatus, params.get("status").toString()).eq(ObjectUtil.isNotEmpty(params.get("date")),DeviceStatusLog::getCurrDate, params.get("date").toString())
+                .eq(ObjectUtil.isNotEmpty(params.get("date")),DeviceStatusLog::getCurrDate, params.get("date").toString())
+                .eq(ObjectUtil.isNotEmpty(params.get("code")),DeviceStatusLog::getCode, params.get("code"))
+                .eq(ObjectUtil.isNotEmpty(params.get("preStatus")),DeviceStatusLog::getPreStatus, params.get("preStatus").toString())
+                .eq(ObjectUtil.isNotEmpty(params.get("changeStatus")),DeviceStatusLog::getChangeStatus, params.get("changeStatus").toString());
+        Map resultMap = deviceStatusLogService.queryMachineEvent(lbqWrapper);
+        return R2.success(resultMap);
+    }
+
+    //MES->产线
+    @ApiOperation(value = "产线机床设备利用率查询接口", notes = "产线机床设备利用率查询接口")
+    @PostMapping("/deviceStatusLog/queryDeviceRate")
+    public R2 queryDeviceRate(@RequestBody Map<String, Object> params) {
+        BaseContextHandler.setTenant("0000");
+
+        LbqWrapper<DeviceRateLog> lbqWrapper = new LbqWrapper<DeviceRateLog>();
+        lbqWrapper.eq(ObjectUtil.isNotEmpty(params.get("date")),DeviceRateLog::getDate, params.get("date").toString())
+                .eq(ObjectUtil.isNotEmpty(params.get("code")),DeviceRateLog::getCode, params.get("code"));
+        //List<DeviceStatusLog> returnData = deviceStatusLogService.list(lbqWrapper);
+        List<DeviceRateLog> returnData = deviceRateLogService.list(lbqWrapper);
+
+        return R2.success(returnData);
+    }
 }

imcs-admin-boot/imcs-business-controller/src/main/java/com/github/zuihou/business/controller/externalApi/SynProductionStatus.java

@@ -117,7 +117,7 @@ public class SynProductionStatus {
         log.debug("接收到设备状态集合信息，参数是{}", data.toString());
 
         String productionStatus = data.get("productionStatus");
-        productionStatus = "[{\"id\":\"1496358296792072192\",\"ip\":\"192.168.11.191\",\"onlineStatus\":\"2\",\"alertMsg\":\"保障中心三坐标交互工位1顶缸上升未到位，请人工检查\",\"alarmState\":false}]";
+        //productionStatus = "[{\"id\":\"1496358296792072192\",\"ip\":\"192.168.11.191\",\"onlineStatus\":\"2\",\"alertMsg\":\"保障中心三坐标交互工位1顶缸上升未到位，请人工检查\",\"alarmState\":false}]";
         //List<Productionresource> productionResources = JSONArray.parseArray(productionStatus,Productionresource.class);
         //productionresourceService.updateBatchById(productionResources);
 
@@ -152,7 +152,7 @@ public class SynProductionStatus {
                            //判断机床设备是否有警报或离线上线处理
                            boolean bool = productionresource.getOnlineStatus().equals("0")|| productionresource.getOnlineStatus().equals("3") || bizProductionResource.getOnlineStatus().equals("0") || bizProductionResource.getOnlineStatus().equals("3");
                            //状态为1表明允许调度处理
-                           DeviceStatusLog deviceStatusLog = DeviceStatusLog.builder().resourceId(productionresource.getId()).preStatus(Integer.parseInt(productionresource.getOnlineStatus())).changeStatus(Integer.parseInt(bizProductionResource.getOnlineStatus())).isMachine(true).status(bool?1:0).currDate(DateUtil.dateToString(new Date())).groupId(groupId).build();
+                           DeviceStatusLog deviceStatusLog = DeviceStatusLog.builder().resourceId(productionresource.getId()).code(productionresource.getCode()).preStatus(Integer.parseInt(productionresource.getOnlineStatus())).changeStatus(Integer.parseInt(bizProductionResource.getOnlineStatus())).isMachine(true).status(bool?1:0).currDate(DateUtil.dateToString(new Date())).groupId(groupId).build();
                            deviceStatusLogList.add(deviceStatusLog);
                            productionresource.setOnlineStatus(bizProductionResource.getOnlineStatus()).setAlarmState(false);
                        }

imcs-admin-boot/imcs-business-entity/src/main/java/com/github/zuihou/business/productionReadyCenter/entity/DeviceRateLog.java

@@ -0,0 +1,62 @@
+package com.github.zuihou.business.productionReadyCenter.entity;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.github.zuihou.base.entity.Entity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.*;
+import lombok.experimental.Accessors;
+import org.hibernate.validator.constraints.Length;
+
+import java.time.LocalDateTime;
+
+import static com.baomidou.mybatisplus.annotation.SqlCondition.LIKE;
+
+@Data
+@NoArgsConstructor
+@ToString(callSuper = true)
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@TableName("imcs_device_rate_log")
+@ApiModel(value = "DeviceRateLog", description = "")
+@AllArgsConstructor
+public class DeviceRateLog extends Entity<Long> {
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "设备ID")
+    @TableField(value = "resource_id", condition = LIKE)
+    @Excel(name = "设备ID")
+    private Long resourceId;
+
+    @ApiModelProperty(value = "设备编码")
+    @TableField(value = "code", condition = LIKE)
+    @Excel(name = "设备编码")
+    private String code;
+
+    @ApiModelProperty(value = "当前日期")
+    @TableField(value = "date", condition = LIKE)
+    @Length(max = 255, message = "当前日期长度不能超过255")
+    @Excel(name = "当前日期")
+    private String date;
+
+    @ApiModelProperty(value = "设备利用率")
+    @TableField(value = "device_rate", condition = LIKE)
+    @Excel(name = "执行状态")
+    private String deviceRate;
+
+    @TableField(exist = false)
+    private String deviceName;
+
+
+    @Builder
+    public DeviceRateLog(Long id, LocalDateTime createTime, Long resourceId, String deviceRate, String code, String date) {
+        this.id = id;
+        this.resourceId = resourceId;
+        this.date = date;
+        this.deviceRate = deviceRate;
+        this.code = code;
+        this.createTime = createTime;
+    }
+}

imcs-admin-boot/imcs-business-entity/src/main/java/com/github/zuihou/business/productionReadyCenter/entity/DeviceStatusLog.java

@@ -0,0 +1,94 @@
+package com.github.zuihou.business.productionReadyCenter.entity;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.github.zuihou.base.entity.Entity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.*;
+import lombok.experimental.Accessors;
+import org.hibernate.validator.constraints.Length;
+
+import java.time.LocalDateTime;
+
+import static com.baomidou.mybatisplus.annotation.SqlCondition.LIKE;
+
+@Data
+@NoArgsConstructor
+@ToString(callSuper = true)
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@TableName("imcs_device_status_log")
+@ApiModel(value = "DeviceStatusLog", description = "")
+@AllArgsConstructor
+public class DeviceStatusLog extends Entity<Long> {
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "设备ID")
+    @TableField(value = "resource_id", condition = LIKE)
+    @Excel(name = "设备ID")
+    private Long resourceId;
+
+    @ApiModelProperty(value = "设备编码")
+    @TableField(value = "code", condition = LIKE)
+    @Excel(name = "设备编码")
+    private String code;
+
+    @ApiModelProperty(value = "是否机床")
+    @TableField(value = "is_machine", condition = LIKE)
+    @Excel(name = "是否机床")
+    private boolean isMachine;
+
+    @ApiModelProperty(value = "改前状态")
+    @TableField(value = "pre_status", condition = LIKE)
+    @Excel(name = "改前状态")
+    private Integer preStatus;
+
+    @ApiModelProperty(value = "改后状态")
+    @TableField(value = "change_status", condition = LIKE)
+    @Excel(name = "改后状态")
+    private Integer changeStatus;
+
+    @ApiModelProperty(value = "当前日期")
+    @TableField(value = "curr_date", condition = LIKE)
+    @Length(max = 255, message = "当前日期长度不能超过255")
+    @Excel(name = "当前日期")
+    private String currDate;
+
+    @ApiModelProperty(value = "分组Id")
+    @TableField(value = "group_id", condition = LIKE)
+    @Length(max = 255, message = "分组Id长度不能超过255")
+    @Excel(name = "分组Id")
+    private String groupId;
+
+    @ApiModelProperty(value = "执行状态")
+    @TableField(value = "status", condition = LIKE)
+    @Excel(name = "执行状态")
+    private Integer status;
+
+    @TableField(exist = false)
+    private String deviceName;
+
+    @TableField(exist = false)
+    private String preStatusName;
+
+    @TableField(exist = false)
+    private String changeStatusName;
+
+    @TableField(exist = false)
+    private Integer cnt;
+
+    @Builder
+    public DeviceStatusLog(Long id, LocalDateTime createTime, Long createUser, LocalDateTime updateTime, Long updateUser, Long resourceId, String groupId, Integer status, boolean isMachine, String code, Integer preStatus, Integer changeStatus, String currDate) {
+        super(id, createTime, createUser, updateTime, updateUser);
+        this.resourceId = resourceId;
+        this.isMachine = isMachine;
+        this.preStatus = preStatus;
+        this.changeStatus = changeStatus;
+        this.currDate = currDate;
+        this.groupId = groupId;
+        this.code = code;
+        this.status = status;
+    }
+}

imcs-admin-boot/imcs-jobs/imcs-jobs-core/pom.xml

@@ -53,6 +53,14 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-websocket</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpclient</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.squareup.okhttp3</groupId>
+            <artifactId>okhttp</artifactId>
+        </dependency>
 
     </dependencies>
 </project>