change - add电流电压曲线接口

os-ems/src/main/java/com/os/ems/record/controller/EmsRecordDnbInstantController.java

@@ -3,6 +3,7 @@ package com.os.ems.record.controller;
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 
+import org.checkerframework.checker.units.qual.A;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -45,6 +46,17 @@ public class EmsRecordDnbInstantController extends BaseController {
         return getDataTable(list);
     }
 
+    /**
+     * 查询电实时数据
+     * @param emsRecordDnbInstant
+     * @return
+     */
+    @GetMapping("/dnbInstantList")
+    public AjaxResult dnbInstantList(EmsRecordDnbInstant emsRecordDnbInstant) {
+        List<EmsRecordDnbInstant> list = emsRecordDnbInstantService.selectDnbInstantList(emsRecordDnbInstant);
+        return success(list);
+    }
+
     /**
      * 导出电实时数据列表
      */

os-ems/src/main/java/com/os/ems/record/domain/EmsRecordDnbInstant.java

@@ -34,28 +34,28 @@ public class EmsRecordDnbInstant extends BaseEntity
     @Excel(name = "采集时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
     private Date collectTime;
 
-    /** A项电压 */
-    @Excel(name = "A项电压")
+    /** A相电压 */
+    @Excel(name = "A相电压")
     private BigDecimal vA;
 
-    /** B项电压 */
-    @Excel(name = "B项电压")
+    /** B相电压 */
+    @Excel(name = "B相电压")
     private BigDecimal vB;
 
-    /** C项电压 */
-    @Excel(name = "C项电压")
+    /** C相电压 */
+    @Excel(name = "C相电压")
     private BigDecimal vC;
 
-    /** A项电流 */
-    @Excel(name = "A项电流")
+    /** A相电流 */
+    @Excel(name = "A相电流")
     private BigDecimal iA;
 
-    /** B项电流 */
-    @Excel(name = "B项电流")
+    /** B相电流 */
+    @Excel(name = "B相电流")
     private BigDecimal iB;
 
-    /** C项电流 */
-    @Excel(name = "C项电流")
+    /** C相电流 */
+    @Excel(name = "C相电流")
     private BigDecimal iC;
 
     /** 记录时间 */

os-ems/src/main/java/com/os/ems/record/mapper/EmsRecordDnbInstantMapper.java

@@ -58,4 +58,11 @@ public interface EmsRecordDnbInstantMapper
      * @return 结果
      */
     public int deleteEmsRecordDnbInstantByObjIds(Long[] objIds);
+
+    /**
+     * 查询电实时数据
+     * @param emsRecordDnbInstant
+     * @return
+     */
+    List<EmsRecordDnbInstant> selectDnbInstantList(EmsRecordDnbInstant emsRecordDnbInstant);
 }

os-ems/src/main/java/com/os/ems/record/service/IEmsRecordDnbInstantService.java

@@ -58,4 +58,11 @@ public interface IEmsRecordDnbInstantService {
      * @return 结果
      */
     public int deleteEmsRecordDnbInstantByObjId(Long objId);
+
+    /**
+     * 查询电实时数据
+     * @param emsRecordDnbInstant
+     * @return
+     */
+    List<EmsRecordDnbInstant> selectDnbInstantList(EmsRecordDnbInstant emsRecordDnbInstant);
 }

os-ems/src/main/java/com/os/ems/record/service/impl/EmsRecordDnbInstantServiceImpl.java

@@ -86,4 +86,14 @@ public class EmsRecordDnbInstantServiceImpl implements IEmsRecordDnbInstantServi
     public int deleteEmsRecordDnbInstantByObjId(Long objId) {
         return emsRecordDnbInstantMapper.deleteEmsRecordDnbInstantByObjId(objId);
     }
+
+    /**
+     * 查询电实时数据
+     * @param emsRecordDnbInstant
+     * @return
+     */
+    @Override
+    public List<EmsRecordDnbInstant> selectDnbInstantList(EmsRecordDnbInstant emsRecordDnbInstant) {
+        return emsRecordDnbInstantMapper.selectDnbInstantList(emsRecordDnbInstant);
+    }
 }

os-ems/src/main/resources/mapper/ems/record/EmsRecordDnbInstantMapper.xml

@@ -74,6 +74,19 @@
         where rdi.obj_id = #{objId}
     </select>
 
+    <select id="selectDnbInstantList" parameterType="EmsRecordDnbInstant" resultMap="EmsRecordDnbInstantResult">
+        <include refid="selectEmsRecordDnbInstantVo"/>
+        <where>
+            <if test="objId != null  and objId != ''">and rdi.obj_id = #{objId}</if>
+            <if test="monitorCode != null  and monitorCode != ''">and rdi.monitor_code = #{monitorCode}</if>
+            <if test="params.beginCollectTime != null and params.beginCollectTime != '' and params.endCollectTime != null and params.endCollectTime != ''">
+                and rdi.collect_time between #{params.beginCollectTime} and #{params.endCollectTime}</if>
+            <if test="params.beginRecordTime != null and params.beginRecordTime != '' and params.endRecordTime != null and params.endRecordTime != ''">
+                and rdi.record_time between #{params.beginRecordTime} and #{params.endRecordTime}</if>
+        </where>
+        order by rdi.collect_time
+    </select>
+
     <insert id="insertEmsRecordDnbInstant" parameterType="EmsRecordDnbInstant" useGeneratedKeys="true"
             keyProperty="objId">
         insert into ems_record_dnb_instant

os-mes/src/main/java/com/os/mes/api/service/impl/ERPPortServiceImpl.java

@@ -134,7 +134,7 @@ public class ERPPortServiceImpl implements IERPPortService {
             HashMap returnData = (HashMap)hashMap.get("ReturnData");
             HashMap<String, Object> data = (HashMap<String, Object>)returnData.get("data");
             latestSalary = resultMapper.readValue(objectMapper.writeValueAsString(data), LatestSalary.class);
-        } catch (JsonProcessingException e) {
+        } catch (Exception e) {
             logger.warn("获取最新工资系数异常:" + requestParam + "|" + result + "|" + e);
         }
         return latestSalary;

os-mes/src/main/resources/mapper/mes/base/BaseProcessInfoMapper.xml

@@ -10,6 +10,7 @@
         <result property="processName" column="process_name"/>
         <result property="processType" column="process_type"/>
         <result property="productLineCode" column="product_line_code"/>
+        <result property="productLineName" column="product_line_name"/>
         <result property="stationCodes" column="station_codes"/>
         <result property="capacityDay" column="capacity_day"/>
         <result property="capacityMonth" column="capacity_month"/>
@@ -26,6 +27,7 @@
                bpi.process_name,
                bpi.process_type,
                bpi.product_line_code,
+               PL.product_line_name,
                bpi.station_codes,
                bpi.capacity_day,
                bpi.capacity_month,
@@ -35,6 +37,7 @@
                bpi.update_by,
                bpi.update_time
         from base_process_info bpi
+                 LEFT JOIN base_product_line PL ON PL.PRODUCT_LINE_CODE = bpi.product_line_code
     </sql>
 <!--SELECT ST.process_code,
        ST.station_code,