fix：工控机监控记录重复数据bug修复

src/main/java/com/qlm/controller/jinzai/ProdBatchController.java

@@ -178,21 +178,36 @@ public class ProdBatchController extends CommonController {
             fromSql.append(" inner join t_jz_device tjd on tdd.device_id = tjd.id");
             fromSql.append(" left join t_factory tf on tjd.factory_id = tf.id");
             fromSql.append(" left join t_workshop tw on tjd.workshop_id = tw.id");
-            fromSql.append(" left join t_jz_item tjp on tdd.product_sku = tjp.sku");
             List<Object> params = new ArrayList<>();
             if (deviceId != null) {
                 fromSql.append(" where tdd.device_id = ?");
                 params.add(deviceId);
             }
-            Page<Record> paginate = Db.paginate(pageNumber, pageSize, "select tdd.*,tjd.id as deviceId, tjd.device_no as deviceNo,tjd.desc as device_name, tf.factory_name, tw.workshop_name, tjp.item_name as product_name", fromSql.toString(), params.toArray());
+            Page<Record> paginate = Db.paginate(pageNumber, pageSize, "select tdd.*,tjd.id as deviceId, tjd.device_no as deviceNo,tjd.desc as device_name, tf.factory_name, tw.workshop_name", fromSql.toString(), params.toArray());
             if (paginate == null) {
                 renderJson(ApiResponse.success(new PageResult<>(0, pageNumber, pageSize, new ArrayList<>())));
                 return;
             }
+
+
+            List<Record> itemList = Db.find("select sku,id,item_name from t_jz_item where Status =1");
+            Map<String,Record>paramMap = new HashMap<>();
+            for (Record record : itemList) {
+                paramMap.put(record.getStr("sku"),record);
+            }
+
+
             List<Record> list = paginate.getList();
             List<DeviceMonitorRecordDto> deviceMonitorRecordDtoList = new ArrayList<>();
             for (Record record : list) {
-                deviceMonitorRecordDtoList.add(convertRecordToDeviceMonitorRecordDto(record));
+                DeviceMonitorRecordDto deviceMonitorRecordDto = convertRecordToDeviceMonitorRecordDto(record);
+                String sku = record.getStr("product_sku");
+                String itemName = "";
+                if (paramMap.containsKey(sku)) {
+                    itemName = paramMap.get(sku).getStr("item_name");
+                }
+                deviceMonitorRecordDto.setProduct(itemName);
+                deviceMonitorRecordDtoList.add(deviceMonitorRecordDto);
             }
             renderJson(new PageResult<>(paginate.getTotalRow(), pageNumber, pageSize, deviceMonitorRecordDtoList));
         } catch (Exception e) {
@@ -557,7 +572,6 @@ public class ProdBatchController extends CommonController {
         deviceMonitorRecordDto.setFactory(record.getStr("factory_name"));
         deviceMonitorRecordDto.setWorkshop(record.getStr("workshop_name"));
         deviceMonitorRecordDto.setLine(record.getStr("device_name"));
-        deviceMonitorRecordDto.setProduct(record.getStr("product_name"));
         deviceMonitorRecordDto.setProductionNum(record.getInt("current_quantity").toString());
         deviceMonitorRecordDto.setTotalNum(record.getInt("total_quantity").toString());
         deviceMonitorRecordDto.setPlatformNum(record.getInt("uploaded_quantity").toString());