CaiXiang/cigs4
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

commit for pull

Browse Source
This commit is contained in:
caixiang
2023-02-24 08:46:36 +08:00
parent 384b1a3d54
commit 6d3b1e9cbb
6 changed files with 228 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

87
ym-packing/src/main/resources/mapper/CamlineMapper.xml
View File

@@ -7,6 +7,41 @@
<result column="platform_id" property="platformId" />
<result column="create_time" property="createTime" />
</resultMap>
<resultMap id="ResultAMap" type="com.cnbm.packing.dto.CamlineExtendArgDTO">
<result column="LAST_UPDATE_TIME" property="lastUpdateTime" />
<result column="PMPP" property="pmpp" />
<result column="ORDER_NAME" property="orderName" />
<result column="BINCLASS_FL1" property="binclassFl1" />
<result column="BINCLASS_FL2" property="binclassFl2" />
<result column="ETA_FL1" property="etaFl1" />
<result column="ETA_FL2" property="etaFl2" />
<result column="FF_FL1" property="ffFl1" />
<result column="FF_FL2" property="ffFl2" />
<result column="IMPP_FL1" property="imppFl1" />
<result column="IMPP_FL2" property="imppFl2" />
<result column="InsolFlashControl_FL1" property="insolflashcontrolFl1" />
<result column="InsolFlashControl_FL2" property="insolflashcontrolFl2" />
<result column="InsolMPP_FL1" property="insolmppFl1" />
<result column="InsolMPP_FL2" property="insolmppFl2" />
<result column="InsolVoc_FL1" property="insolvocFl1" />
<result column="InsolVoc_FL2" property="insolvocFl2" />
<result column="Insol_FL1" property="insolFl1" />
<result column="Insol_FL2" property="insolFl2" />
<result column="ISC_FL1" property="iscFl1" />
<result column="ISC_FL2" property="iscFl2" />
<result column="MEAS_TIME_FL1" property="measTimeFl1" />
<result column="MEAS_TIME_FL2" property="measTimeFl2" />
<result column="PMPP_FL1" property="pmppFl1" />
<result column="PMPP_FL2" property="pmppFl2" />
<result column="Tcell_FL1" property="tcellFl1" />
<result column="Tcell_FL2" property="tcellFl2" />
<result column="Tmonicell_FL1" property="tmonicellFl1" />
<result column="Tmonicell_FL2" property="tmonicellFl2" />
<result column="UMPP_FL1" property="umppFl1" />
<result column="UMPP_FL2" property="umppFl2" />
<result column="UOC_FL1" property="uocFl1" />
<result column="UOC_FL2" property="uocFl2" />
</resultMap>
<select id="getByid" resultType="float">
select pd.pmpp from process_data pd
@@ -31,6 +66,58 @@
LIMIT 1
</select>
<select id="getExtendArgFromCamline" resultMap="ResultAMap">
SELECT
eo.`NAME` as ORDER_NAME,
flr.LAST_UPDATE_TIME,
flr.BINCLASS_FL1,-- 1为 PID16 电池相关信息
flr.BINCLASS_FL2,-- 2为 PID22 电池相关信息
flr.ETA_FL1,
flr.ETA_FL2,
flr.FF_FL1,
flr.FF_FL2,
flr.IMPP_FL1,
flr.IMPP_FL2,
flr.InsolFlashControl_FL1,
flr.InsolFlashControl_FL2,
flr.InsolMPP_FL1,
flr.InsolMPP_FL2,
flr.InsolVoc_FL1,
flr.InsolVoc_FL2,
flr.Insol_FL1,
flr.Insol_FL2,
flr.ISC_FL1,
flr.ISC_FL2,
flr.MEAS_TIME_FL1,
flr.MEAS_TIME_FL2,
flr.PMPP_FL1,-- pid16实测PMPP
flr.PMPP_FL2,-- pid22实测PMPP
flr.Tcell_FL1,
flr.Tcell_FL2,
flr.Tmonicell_FL1,
flr.Tmonicell_FL2,
flr.UMPP_FL1,
flr.UMPP_FL2,
flr.UOC_FL1,
flr.UOC_FL2,
flc.PMPP -- 补偿后功率,用我们的
FROM
ue_flasher_data_raw flr
LEFT JOIN e_tracking_unit tu ON flr.mainid = tu.id
LEFT JOIN ue_flasher_data_calc flc ON flc.mainid = tu.id
LEFT JOIN er_order eo ON tu.ORDER_ID = eo.ID
WHERE
flr.PMPP_FL2 != 0
and
tu.name=#{subId}
GROUP BY
tu.`NAME`
ORDER BY
flr.LAST_UPDATE_TIME DESC
LIMIT 1
</select>
<select id="getOrderNameBySubId" resultType="string">
SELECT
eorder.name