新增MES日志数据查询接口

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

@@ -1,9 +1,13 @@
 package com.github.zuihou.business.productionReadyCenter.dao;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.github.zuihou.base.mapper.SuperMapper;
 import com.github.zuihou.business.productionReadyCenter.entity.CuttingToolSynRecord;
+import com.github.zuihou.business.productionReadyCenter.entity.DeviceStateRecord;
+import com.github.zuihou.database.mybatis.conditions.query.LbqWrapper;
 import org.springframework.stereotype.Repository;
 
 @Repository
 public interface CuttingToolSynRecordMapper extends SuperMapper<CuttingToolSynRecord> {
+    IPage<DeviceStateRecord> pageList(IPage page, LbqWrapper<CuttingToolSynRecord> wrapper);
 }

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

@@ -1,9 +1,17 @@
 package com.github.zuihou.business.productionReadyCenter.dao;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.github.zuihou.base.mapper.SuperMapper;
 import com.github.zuihou.business.productionReadyCenter.entity.DeviceStateRecord;
+import com.github.zuihou.database.mybatis.auth.DataScope;
+import com.github.zuihou.database.mybatis.conditions.query.LbqWrapper;
+import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
 @Repository
 public interface DeviceStateRecordMapper extends SuperMapper<DeviceStateRecord> {
+
+    IPage<DeviceStateRecord> pageList(IPage page, @Param(Constants.WRAPPER) LbqWrapper<DeviceStateRecord> wrapper);
+
 }

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

@@ -1,7 +1,13 @@
 package com.github.zuihou.business.productionReadyCenter.service;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.github.zuihou.base.service.SuperService;
 import com.github.zuihou.business.productionReadyCenter.entity.CuttingToolSynRecord;
+import com.github.zuihou.business.productionReadyCenter.entity.DeviceStateRecord;
+import com.github.zuihou.database.mybatis.conditions.query.LbqWrapper;
 
 public interface CuttingToolSynRecordService  extends SuperService<CuttingToolSynRecord> {
+
+    IPage<DeviceStateRecord> pageList(IPage page, LbqWrapper<CuttingToolSynRecord> wrapper);
+
 }

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

@@ -1,7 +1,11 @@
 package com.github.zuihou.business.productionReadyCenter.service;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.github.zuihou.base.service.SuperService;
 import com.github.zuihou.business.productionReadyCenter.entity.DeviceStateRecord;
+import com.github.zuihou.database.mybatis.conditions.query.LbqWrapper;
 
 public interface DeviceStateRecordService extends SuperService<DeviceStateRecord> {
+
+    IPage<DeviceStateRecord> pageList(IPage page, LbqWrapper<DeviceStateRecord> wrapper);
 }

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

@@ -1,13 +1,20 @@
 package com.github.zuihou.business.productionReadyCenter.service.impl;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.github.zuihou.base.service.SuperServiceImpl;
 import com.github.zuihou.business.productionReadyCenter.dao.CuttingToolSynRecordMapper;
 import com.github.zuihou.business.productionReadyCenter.entity.CuttingToolSynRecord;
+import com.github.zuihou.business.productionReadyCenter.entity.DeviceStateRecord;
 import com.github.zuihou.business.productionReadyCenter.service.CuttingToolSynRecordService;
+import com.github.zuihou.database.mybatis.conditions.query.LbqWrapper;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
 @Slf4j
 @Service
 public class CuttingToolSynRecordServiceImpl extends SuperServiceImpl<CuttingToolSynRecordMapper, CuttingToolSynRecord> implements CuttingToolSynRecordService {
+    @Override
+    public IPage<DeviceStateRecord> pageList(IPage page, LbqWrapper<CuttingToolSynRecord> wrapper) {
+        return baseMapper.pageList(page, wrapper);
+    }
 }

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

@@ -1,9 +1,12 @@
 package com.github.zuihou.business.productionReadyCenter.service.impl;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.github.zuihou.base.service.SuperServiceImpl;
 import com.github.zuihou.business.productionReadyCenter.dao.DeviceStateRecordMapper;
 import com.github.zuihou.business.productionReadyCenter.entity.DeviceStateRecord;
 import com.github.zuihou.business.productionReadyCenter.service.DeviceStateRecordService;
+import com.github.zuihou.database.mybatis.auth.DataScope;
+import com.github.zuihou.database.mybatis.conditions.query.LbqWrapper;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
@@ -11,4 +14,8 @@ import org.springframework.stereotype.Service;
 @Service
 public class DeviceStateRecordServiceImpl extends SuperServiceImpl<DeviceStateRecordMapper, DeviceStateRecord> implements DeviceStateRecordService {
 
+    @Override
+    public IPage<DeviceStateRecord> pageList(IPage page, LbqWrapper<DeviceStateRecord> wrapper) {
+        return baseMapper.pageList(page, wrapper);
+    }
 }

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

@@ -0,0 +1,34 @@
+<?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.CuttingToolSynRecordMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.github.zuihou.business.productionReadyCenter.entity.CuttingToolSynRecord">
+        <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="cutting_tool_name" jdbcType="VARCHAR" property="cuttingToolName"/>
+        <result column="type" jdbcType="VARCHAR" property="type"/>
+        <result column="machine_id" jdbcType="BIGINT" property="machineId"/>
+        <result column="current_tool_no" jdbcType="VARCHAR" property="currentToolNo"/>
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id,create_time,create_user,update_time,update_user,current_tool_no,cutting_tool_name,
+        machine_id, type
+    </sql>
+
+    <!-- 分页 -->
+    <select id="pageList" resultMap="BaseResultMap">
+        select
+        <include refid="Base_Column_List"/>
+        from (
+             select r.*, t.name from cutting_tool_syn_record r left join imcs_tenant_productionresource t
+             on r.machine_id = t.id
+        ) s ${ew.customSqlSegment}
+    </select>
+
+</mapper>

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

@@ -0,0 +1,34 @@
+<?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.DeviceStateRecordMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.github.zuihou.business.productionReadyCenter.entity.DeviceStateRecord">
+        <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="name" jdbcType="VARCHAR" property="name"/>
+        <result column="create_date" jdbcType="VARCHAR" property="createDate"/>
+        <result column="machine_id" jdbcType="BIGINT" property="machineId"/>
+        <result column="device_state" jdbcType="VARCHAR" property="deviceState"/>
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id,create_time,create_user,update_time,update_user,name,
+        machine_id, create_date, device_state
+    </sql>
+
+    <!-- 分页 -->
+    <select id="pageList" resultMap="BaseResultMap">
+        select
+        <include refid="Base_Column_List"/>
+        from (
+             select r.*, t.name from device_state_record r left join imcs_tenant_productionresource t
+             on r.machine_id = t.id
+        ) s ${ew.customSqlSegment}
+    </select>
+
+</mapper>

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

@@ -2,12 +2,23 @@ package com.github.zuihou.business.controller.externalApi;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.github.zuihou.base.R;
+import com.github.zuihou.base.request.PageParams;
 import com.github.zuihou.business.externalApi.service.MesService;
+import com.github.zuihou.business.productionReadyCenter.entity.CuttingToolSynRecord;
+import com.github.zuihou.business.productionReadyCenter.entity.DeviceStateRecord;
+import com.github.zuihou.business.productionReadyCenter.service.CuttingToolSynRecordService;
+import com.github.zuihou.business.productionReadyCenter.service.DeviceStateRecordService;
 import com.github.zuihou.business.productionResourceCenter.entity.Productionresource;
 import com.github.zuihou.business.util.MsgUtil;
 import com.github.zuihou.common.util.StringUtil;
 import com.github.zuihou.context.BaseContextHandler;
+import com.github.zuihou.database.mybatis.conditions.Wraps;
+import com.github.zuihou.database.mybatis.conditions.query.LbqWrapper;
+import com.github.zuihou.database.mybatis.conditions.query.QueryWrap;
 import com.github.zuihou.file.dto.AttachmentDTO;
 import com.github.zuihou.log.annotation.SysLog;
 import com.github.zuihou.utils.BizAssert;
@@ -20,6 +31,7 @@ import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.util.Date;
+import java.util.List;
 import java.util.Map;
 
 import static com.github.zuihou.exception.code.ExceptionCode.BASE_VALID_PARAM;
@@ -38,6 +50,12 @@ public class MesController {
     @Autowired
     private MesService mesService;
 
+    @Autowired
+    private DeviceStateRecordService deviceStateRecordService;
+
+    @Autowired
+    private CuttingToolSynRecordService cuttingToolSynRecordService;
+
     @ApiOperation(value = "站内机床数据采集接口", notes = "站内机床数据采集接口")
     @PostMapping("/dataCollector")
     public R dataCollector(@RequestBody Map<String, Object> params) {
@@ -118,4 +136,42 @@ public class MesController {
         return R.success();
     }
 
+    @ApiOperation(value = "设备状态变化记录接口", notes = "设备状态变化记录接口")
+    @PostMapping("/getDeviceStateRecord")
+    public R getDeviceStateRecord(@RequestBody PageParams<DeviceStateRecord> params) {
+        IPage<DeviceStateRecord> page = params.buildPage();
+        QueryWrap<DeviceStateRecord> queryWrapper = (params.getModel() == null) ? Wraps.q() : Wraps.q(params.getModel());
+        LbqWrapper<DeviceStateRecord> lbqWrapper = queryWrapper.lambda();
+        if(params.getMap().size()>0){
+            Map<String, String> map = params.getMap();
+            if(map.containsKey("createTime_st")){
+                lbqWrapper.ge(DeviceStateRecord::getCreateTime, map.get("createTime_st").toString());
+            }
+            if(map.containsKey("createTime_ed")){
+                lbqWrapper.le(DeviceStateRecord::getCreateTime, map.get("createTime_ed").toString());
+            }
+        }
+        IPage dataList = deviceStateRecordService.pageList(page, lbqWrapper);
+        return R.success(dataList);
+    }
+
+    @ApiOperation(value = "刀具同步变化记录接口", notes = "刀具同步状态变化记录接口")
+    @PostMapping("/getCuttingToolSynRecord")
+    public R getCuttingToolSynRecord(@RequestBody PageParams<CuttingToolSynRecord> params) {
+        IPage<CuttingToolSynRecord> page = params.buildPage();
+        QueryWrap<CuttingToolSynRecord> queryWrapper = (params.getModel() == null) ? Wraps.q() : Wraps.q(params.getModel());
+        LbqWrapper<CuttingToolSynRecord> lbqWrapper = queryWrapper.lambda();
+        if(params.getMap().size()>0){
+            Map<String, String> map = params.getMap();
+            if(map.containsKey("createTime_st")){
+                lbqWrapper.ge(CuttingToolSynRecord::getCreateTime, map.get("createTime_st").toString());
+            }
+            if(map.containsKey("createTime_ed")){
+                lbqWrapper.le(CuttingToolSynRecord::getCreateTime, map.get("createTime_ed").toString());
+            }
+        }
+        IPage dataList = cuttingToolSynRecordService.pageList(page, lbqWrapper);
+        return R.success(dataList);
+    }
+
 }