。。

src/main/java/com/unissoft/systemManage/controller/QuantityStatisticsController.java

@@ -1,9 +1,14 @@
 package com.unissoft.systemManage.controller;
 
 
+import java.text.DateFormat;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
+import org.junit.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -78,4 +83,18 @@ public class QuantityStatisticsController {
 		Map<String, Object> map = quantityStatisticsService.getOutInNumber(pageParam);
 		return ResultView.success(map);
 	}
+    
+    
+    /**
+     * 库区图
+     */
+    @SystemLog(operModul = "首页", operType = "库区图", operDesc = "库区图")
+    @PostMapping("/getHouseMessage")
+	@ApiOperation(value="库区图", notes="库区图")
+	public ResultView getHouseMessage(@RequestBody PageParam pageParam) {
+		Map<String, Object> map = quantityStatisticsService.getHouseMessage(pageParam);
+		return ResultView.success(map);
+	}
+    
+    
 }

src/main/java/com/unissoft/systemManage/model/OrgInfo.java

@@ -96,4 +96,10 @@ public class OrgInfo implements Serializable {
     @TableField("last_time")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date lastTime;
+    
+    @TableField(exist = false)
+	private String pzName; //品种名称
+    
+    @TableField(exist = false)
+	private String lsNumber; //当前粮食数量
 }

src/main/java/com/unissoft/systemManage/service/QuantityStatisticsService.java

@@ -24,4 +24,6 @@ public interface QuantityStatisticsService extends IService<QuantityStatistics>
 
 	Map<String, Object> getOutInNumber(PageParam pageParam);
 
+	Map<String, Object> getHouseMessage(PageParam pageParam);
+
 }

src/main/java/com/unissoft/systemManage/service/impl/QuantityStatisticsServiceImpl.java

@@ -19,7 +19,10 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 
 import java.math.BigDecimal;
+import java.text.DateFormat;
+import java.text.ParseException;
 import java.text.SimpleDateFormat;
+import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.Date;
 import java.util.HashMap;
@@ -98,12 +101,16 @@ public class QuantityStatisticsServiceImpl extends ServiceImpl<QuantityStatistic
 
 	@Override
 	public Map<String, Object> getDataChange(PageParam pageParam) {
+		
+        
 		// TODO Auto-generated method stub
 		Map<String, Object> map = new HashMap<>();
 		String condition = pageParam.getCondition();
 		if (!StringUtils.isEmpty(condition)) {
         	JSONObject jsStr = JSON.parseObject(condition);
         	Integer houseId = jsStr.getIntValue("houseId");
+        	String startTime = jsStr.getString("startTime");
+        	String endTime = jsStr.getString("endTime");
         	if(null != houseId && !"".equals(houseId)){
         		OrgInfo orgInfo = orgInfoMapper.selectById(houseId);
         		Map<String, Object> parm_map = new HashMap<>();
@@ -122,7 +129,8 @@ public class QuantityStatisticsServiceImpl extends ServiceImpl<QuantityStatistic
             	    QueryWrapper<NBasicEdge> queryWrapper1 = new QueryWrapper<>();
             	    SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");//注意月份是MM
             	    Calendar calendar = Calendar.getInstance();
-            		calendar.setTime(new Date());
+            	    Date date = new Date();
+            		calendar.setTime(date);
             		calendar.add(Calendar.DAY_OF_MONTH, -1);  // 在当前日基础上-1
             		//System.out.println(sdf.format(calendar.getTime()));
             		queryWrapper1.likeRight("begin_time", sdf.format(calendar.getTime()));
@@ -135,14 +143,78 @@ public class QuantityStatisticsServiceImpl extends ServiceImpl<QuantityStatistic
             	    }
             	    if(nBasicEdgeList.size()>1){
             	    	BigDecimal thisNumber = new BigDecimal(nBasicEdgeList.get(0).getLkWeight());
-            	    	BigDecimal lastNumber = new BigDecimal(lastList.get(0).getLkWeight());
+            	    	BigDecimal lastNumber = new BigDecimal(0);
+            	    	if(lastList.size()>0){
+                	         lastNumber = new BigDecimal(lastList.get(0).getLkWeight());
+            	    	}
             	    	BigDecimal poor = thisNumber.subtract(lastNumber);
             	    	BigDecimal complete = poor.divide(lastNumber,2,BigDecimal.ROUND_HALF_UP);
             	    	BigDecimal changeRatio = complete.multiply(new BigDecimal("100"));
             	    	list.get(0).setChangeRatio(changeRatio.stripTrailingZeros().toPlainString());
             	    }
             	    map.put("clxx", list.get(0));
-            	    map.put("nBasicEdgeList", nBasicEdgeList);
+            	    
+            	    QueryWrapper<NBasicEdge> ew = new QueryWrapper<>();
+            	    ew.eq("house_id", houseId);
+            	    if(StringUtils.isEmpty(startTime) && StringUtils.isEmpty(endTime)){
+            	    	Calendar calendar1 = Calendar.getInstance();
+                 		calendar1.setTime(date);
+                 		calendar1.add(Calendar.DAY_OF_MONTH, -7);  // 在当前日基础上-7
+                 		//System.out.println(sdf.format(calendar.getTime()));
+                 		endTime = sdf.format(date);
+                 		startTime = sdf.format(calendar1.getTime());
+                 		System.out.println(startTime+"---------------"+endTime);
+                 		map.put("startTime", startTime);
+                 		map.put("endTime", endTime);
+                 		
+            	    }
+            	    
+            	    ew.apply(!StringUtils.isEmpty(startTime),
+                            "date_format (begin_time,'%Y-%m-%d') >= date_format('" + startTime + "','%Y-%m-%d')")
+                    .apply(!StringUtils.isEmpty(endTime),
+                            "date_format (begin_time,'%Y-%m-%d') <= date_format('" + endTime + "','%Y-%m-%d')");
+            	    
+            	    ew.orderByDesc("id");
+            	    List<NBasicEdge> nBasicEdgeList1 = nBasicEdgeMapper.selectList(ew);
+            	    List dayList = new ArrayList<>();
+            	    List wightList = new ArrayList<>();
+            	    
+            	    
+            	    for (int i = 0; i < nBasicEdgeList1.size(); i++) {
+						if(i==0 || (i!=0 && !dayList.contains(sdf.format(nBasicEdgeList1.get(i).getBeginTime())))){
+							dayList.add(sdf.format(nBasicEdgeList1.get(i).getBeginTime()));
+							wightList.add(nBasicEdgeList1.get(i).getLkWeight());
+						}
+					}
+
+            		
+                    Long startT;
+            		try {
+            			startT = sdf.parse(startTime).getTime();
+            			 Long endT = sdf.parse(endTime).getTime();  
+            		     Long oneDay = 1000 * 60 * 60 * 24l;  
+            		     Long time = endT;  
+            		        while (time >= startT) {  
+            		            Date d = new Date(time);  
+            		            DateFormat df = new SimpleDateFormat("yyyy-MM-dd");  
+            		            String date1=df.format(d);
+            		            System.out.println(date1+"****************");
+            		            if(!dayList.contains(date1)){
+            		            	dayList.add(date1);
+        							wightList.add(0);
+            		            }
+            		            
+            		            time -= oneDay; 
+            		        }
+            		} catch (ParseException e) {
+            			// TODO Auto-generated catch block
+            			e.printStackTrace();
+            		}  
+                   
+            		
+            	    
+            	    map.put("dayList", dayList);
+            	    map.put("wightList", wightList);
             	    
         	    }else{
         	    	map.put("clxx", "无储粮信息");
@@ -212,7 +284,11 @@ public class QuantityStatisticsServiceImpl extends ServiceImpl<QuantityStatistic
 				BigDecimal number = new BigDecimal(nBasicEdgeList.get(i).getLkWeight());
 				//System.out.println(nBasicEdgeList.get(i).getHStatus()+"--------------"+nBasicEdgeList.get(i).getLkWeight());
 				if(i == 0){
-					BigDecimal lastDayNumber = new BigDecimal(lastList.get(0).getLkWeight());
+					BigDecimal lastDayNumber = new BigDecimal(0);
+
+					if(lastList.size()>0){
+						 lastDayNumber = new BigDecimal(lastList.get(0).getLkWeight());
+					}
 					
 					if(nBasicEdgeList.get(i).getHStatus().equals("2")){ //2入库 4 出库
 						inNumber = inNumber.add(number.subtract(lastDayNumber));
@@ -237,7 +313,8 @@ public class QuantityStatisticsServiceImpl extends ServiceImpl<QuantityStatistic
 			for (int i = 0; i < lastList.size(); i++) {
 				BigDecimal number = new BigDecimal(lastList.get(i).getLkWeight());
 				if(lastList.size() == i+1){
-					BigDecimal lastDayNumber = null ;
+					
+					BigDecimal lastDayNumber = new BigDecimal(0);
 					if(lastEstList.size()>0){
 					   lastDayNumber = new BigDecimal(lastEstList.get(0).getLkWeight());
 					}
@@ -294,6 +371,48 @@ public class QuantityStatisticsServiceImpl extends ServiceImpl<QuantityStatistic
 		 map.put("remainingNumber", remainingNumber);
 		return map;
 	}
+
+	@Override
+	public Map<String, Object> getHouseMessage(PageParam pageParam) {
+		// TODO Auto-generated method stub
+		Map<String, Object> map = new HashMap<>();
+		String condition = pageParam.getCondition();
+		if (!StringUtils.isEmpty(condition)) {
+	        
+        	JSONObject jsStr = JSON.parseObject(condition);
+        	Integer orgId = jsStr.getIntValue("orgId");
+    		
+    		Map<String, Object> parm_map = new HashMap<>();
+    		if(!StringUtils.isEmpty(orgId.toString())){
+    			parm_map.put("parent_id", orgId);
+    		}
+    	    parm_map.put("store_type_code", 300003);
+    	    List<OrgInfo> list = orgInfoMapper.selectByMap(parm_map);
+    	    
+    	    //List<StorehouseClxx> list = storehouseClxxMapper.selectByMap(parm_map);
+    	    if(list.size()>0){
+    	    	for (OrgInfo orgInfo : list) {
+    	    		Map<String, Object> mp = new HashMap<>();
+    	    	    mp.put("main_id", orgInfo.getId());
+    	    	    List<StorehouseClxx> clxxList = storehouseClxxMapper.selectByMap(mp);
+    	    	    BasicEnum basicEnum = basicEnumMapper.selectById(clxxList.get(0).getPz());
+    	    	    orgInfo.setPzName(basicEnum.getEnumName());//粮食种类
+            	    
+            	    QueryWrapper<NBasicEdge> queryWrapper = new QueryWrapper<>();
+            	    queryWrapper.eq("house_id", orgInfo.getId());
+            	    queryWrapper.orderByDesc("id");
+            	    List<NBasicEdge> nBasicEdgeList = nBasicEdgeMapper.selectList(queryWrapper);
+            	    if(nBasicEdgeList.size()>0){
+            	    	orgInfo.setLsNumber(nBasicEdgeList.get(0).getLkWeight().toString());
+            	    }
+            	   
+				}
+    	    }
+    	    map.put("list", list);
+    	    
+		}	
+		return map;
+	}
 	
 
 }