1053:出入库报表增加cid查询

src/main/java/com/neotel/smfcore/core/report/ReportController.java

@@ -85,7 +85,7 @@ public class ReportController {
 
 
 
 
         String pn = query.getPn();
         String pn = query.getPn();
-        List<ChartItem> chartItemList = storageManager.getRunStatusData(startDay, endDay, pn);
+        List<ChartItem> chartItemList = storageManager.getRunStatusData(startDay, endDay, pn,null);
 
 
         InoutDataDto dto = new InoutDataDto();
         InoutDataDto dto = new InoutDataDto();
         for (ChartItem item :chartItemList) {
         for (ChartItem item :chartItemList) {

src/main/java/com/neotel/smfcore/core/storage/service/manager/IStorageManager.java

@@ -14,5 +14,5 @@ public interface IStorageManager extends IBaseManager<Storage> {
 
 
     void clearStorageGroup(String groupId);
     void clearStorageGroup(String groupId);
 
 
-    List<ChartItem> getRunStatusData(Date fromDate, Date toDate, String partNumber);
+    List<ChartItem> getRunStatusData(Date fromDate, Date toDate, String partNumber,List<String> cids);
 }
 }

src/main/java/com/neotel/smfcore/core/storage/service/manager/impl/StorageManagerImpl.java

@@ -80,7 +80,7 @@ public class StorageManagerImpl implements IStorageManager {
      * 获取某个时间段的统计信息ChartItem 的 value 为入库量,value2为出库量,value3为报警次数,value4为报警持续时间
      * 获取某个时间段的统计信息ChartItem 的 value 为入库量,value2为出库量,value3为报警次数,value4为报警持续时间
      */
      */
     @Override
     @Override
-    public List<ChartItem> getRunStatusData(Date fromDate, Date toDate, String partNumber){
+    public List<ChartItem> getRunStatusData(Date fromDate, Date toDate, String partNumber,List<String> cids){
         if(fromDate == null || toDate == null){
         if(fromDate == null || toDate == null){
             return new ArrayList<>();
             return new ArrayList<>();
         }
         }
@@ -104,7 +104,7 @@ public class StorageManagerImpl implements IStorageManager {
             c.add(Calendar.DAY_OF_YEAR,1);
             c.add(Calendar.DAY_OF_YEAR,1);
         }while (c.getTimeInMillis() <= endTime);
         }while (c.getTimeInMillis() <= endTime);
 
 
-        List<ChartItem> putInData = dataLogDao.putInChart(startDay, endDay,partNumber);
+        List<ChartItem> putInData = dataLogDao.putInChart(startDay, endDay,partNumber,cids);
         for (ChartItem putInItem : putInData){
         for (ChartItem putInItem : putInData){
             String dayOfYear = putInItem.getLabel();
             String dayOfYear = putInItem.getLabel();
             ChartItem item = inOutDataMap.get(dayOfYear);
             ChartItem item = inOutDataMap.get(dayOfYear);
@@ -113,7 +113,7 @@ public class StorageManagerImpl implements IStorageManager {
             }
             }
         }
         }
 
 
-        List<ChartItem> checkOutData = dataLogDao.checkOutChart(startDay, endDay,partNumber);
+        List<ChartItem> checkOutData = dataLogDao.checkOutChart(startDay, endDay,partNumber,cids);
 
 
         for (ChartItem checkOutItem : checkOutData){
         for (ChartItem checkOutItem : checkOutData){
             String dayOfYear = checkOutItem.getLabel();
             String dayOfYear = checkOutItem.getLabel();

src/main/java/com/neotel/smfcore/core/system/service/dao/IDataLogDao.java

@@ -9,9 +9,9 @@ import java.util.Date;
 import java.util.List;
 import java.util.List;
 
 
 public interface IDataLogDao extends IBaseDao {
 public interface IDataLogDao extends IBaseDao {
-    List<ChartItem> putInChart(Date startDay, Date endDay, String partNumber);
+    List<ChartItem> putInChart(Date startDay, Date endDay, String partNumber,List<String> cids);
 
 
-    List<ChartItem> checkOutChart(Date startDay, Date endDay, String partNumber);
+    List<ChartItem> checkOutChart(Date startDay, Date endDay, String partNumber,List<String> cids);
 
 
     List<DataLog> findHistory(String bid, int num);
     List<DataLog> findHistory(String bid, int num);
 
 

src/main/java/com/neotel/smfcore/core/system/service/dao/impl/DataLogDaoImpl.java

@@ -28,16 +28,16 @@ public class DataLogDaoImpl extends AbstractBaseDao implements IDataLogDao {
     }
     }
 
 
     @Override
     @Override
-    public List<ChartItem> putInChart(Date fromTime, Date toTime,String partNumber){
-        return chart(fromTime, toTime, OP.PUT_IN,partNumber);
+    public List<ChartItem> putInChart(Date fromTime, Date toTime,String partNumber,List<String> cids){
+        return chart(fromTime, toTime, OP.PUT_IN,partNumber,cids);
     }
     }
 
 
     @Override
     @Override
-    public List<ChartItem> checkOutChart(Date fromTime, Date toTime,String partNumber){
-        return chart(fromTime, toTime, OP.CHECKOUT,partNumber);
+    public List<ChartItem> checkOutChart(Date fromTime, Date toTime,String partNumber,List<String> cids){
+        return chart(fromTime, toTime, OP.CHECKOUT,partNumber,cids);
     }
     }
 
 
-    private List<ChartItem> chart(Date fromTime, Date toTime, int type, String partNumber){
+    private List<ChartItem> chart(Date fromTime, Date toTime, int type, String partNumber,List<String> cids){
         Date addOneDayToTime = DateUtil.addOneDayNoTime(toTime);
         Date addOneDayToTime = DateUtil.addOneDayNoTime(toTime);
         Criteria c = new Criteria().andOperator(Criteria.where("updateDate").gte(fromTime),
         Criteria c = new Criteria().andOperator(Criteria.where("updateDate").gte(fromTime),
                 Criteria.where("updateDate").lt(addOneDayToTime)).and("type").is(type);
                 Criteria.where("updateDate").lt(addOneDayToTime)).and("type").is(type);
@@ -45,6 +45,9 @@ public class DataLogDaoImpl extends AbstractBaseDao implements IDataLogDao {
         if(Strings.isNotBlank(partNumber)){
         if(Strings.isNotBlank(partNumber)){
             c.and("partNumber").is(partNumber);
             c.and("partNumber").is(partNumber);
         }
         }
+        if(cids!=null&& cids.size()>0){
+            c.and("cid").in(cids.toArray());
+        }
         Aggregation agg = Aggregation.newAggregation(
         Aggregation agg = Aggregation.newAggregation(
                 Aggregation.match(c),
                 Aggregation.match(c),
                 Aggregation.project().and("updateDate").extractDayOfYear().as("label"),
                 Aggregation.project().and("updateDate").extractDayOfYear().as("label"),

src/main/java/com/neotel/smfcore/custom/micron1053/controller/MicronStatusController.java

@@ -173,7 +173,7 @@ public class MicronStatusController {
             time.setTime(new Date());
             time.setTime(new Date());
             time.add(Calendar.DAY_OF_YEAR, -6);
             time.add(Calendar.DAY_OF_YEAR, -6);
             String today = DateUtil.toDateTimeString(new Date());
             String today = DateUtil.toDateTimeString(new Date());
-            List<ChartItem> chartItems = storageManager.getRunStatusData(time.getTime(), new Date(), "");
+            List<ChartItem> chartItems = storageManager.getRunStatusData(time.getTime(), new Date(), "",cids);
 
 
             for (ChartItem chartItem :
             for (ChartItem chartItem :
                     chartItems) {
                     chartItems) {