Fancy
2024-12-19 3c61c5f4bc92f75b4fe60653eaa676a21cde4325
edit BI Device log and planList
3个文件已修改
18 ■■■■■ 已修改文件
pms-parent/pms-global/src/main/resources/mapper/StaWipSnExMapper.xml 11 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pms-parent/pms-web-other/src/main/java/com/dy/pmsOther/screen/ScreenReportCtrl.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
pms-parent/pms-web-other/src/main/java/com/dy/pmsOther/screen/ScreenReportSv.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pms-parent/pms-global/src/main/resources/mapper/StaWipSnExMapper.xml
@@ -27,10 +27,15 @@
        where  id = #{id,jdbcType=BIGINT} 
    </select>
    <select id="selectByDeviceNo" resultType="com.dy.pmsGlobal.pojoSta.StaWipSnEx">
        select
        SELECT
        <include refid="Base_Column_List" />
        from sta_wip_sn_ex
        where  device_no = #{deviceNo,jdbcType=VARCHAR}
        FROM (
        SELECT
        <include refid="Base_Column_List" />
          , ROW_NUMBER() OVER (PARTITION BY device_no,product_no ORDER BY create_time DESC) AS rn
        FROM sta_wip_sn_ex   WHERE device_no = #{deviceNo,jdbcType=VARCHAR}
        ) t
        WHERE rn = 1;
    </select>
    <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
pms-parent/pms-web-other/src/main/java/com/dy/pmsOther/screen/ScreenReportCtrl.java
@@ -33,7 +33,7 @@
    public BaseResponse<Map<String, Object>> getDeviceInfo(String deviceNo) {
        log.info("DeviceReportCtl.getDeviceInfo():{}",deviceNo);
        Map<String, Object> result = sv.getDeviceInfo(deviceNo);
        return BaseResponseUtils.buildSuccess(null);
        return BaseResponseUtils.buildSuccess(result);
    }
    /**
     * 根据时间区间查询 所有过站记录
pms-parent/pms-web-other/src/main/java/com/dy/pmsOther/screen/ScreenReportSv.java
@@ -122,7 +122,7 @@
    public List<JSONObject> queryPlanList() {
        List<JSONObject> list = assemblyPlanDao.queryPlanList();
        Map<String, JSONObject> map = new ConcurrentHashMap<>(); // 使用并发安全的Map
        /*Map<String, JSONObject> map = new ConcurrentHashMap<>(); // 使用并发安全的Map
        for (JSONObject item : list) {
            String planId = String.valueOf(item.getObj("planId"));
            JSONObject innerObject = new JSONObject()
@@ -141,6 +141,7 @@
                map.put(planId, outObject);
            }
        }
        return map.values().stream().collect(Collectors.toList());
        return map.values().stream().collect(Collectors.toList());*/
        return list;
    }
}