首页柱形图、饼状图、分仓保管账功能修改

pom.xml

@@ -118,6 +118,11 @@
             <groupId>org.springframework.session</groupId>
             <artifactId>spring-session-data-redis</artifactId>
         </dependency>
+        <!-- feign -->
+		<dependency>
+			<groupId>org.springframework.cloud</groupId>
+			<artifactId>spring-cloud-starter-openfeign</artifactId>
+		</dependency>
 	</dependencies>
 
 	<dependencyManagement>

src/main/java/com/chinaitop/agile/DepotAgileApplication.java

@@ -5,11 +5,13 @@ import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
 import org.springframework.cloud.netflix.eureka.EnableEurekaClient;
+import org.springframework.cloud.openfeign.EnableFeignClients;
 
 
 @EnableEurekaClient
 @EnableDiscoveryClient
 @SpringBootApplication
+@EnableFeignClients
 @MapperScan(basePackages = {"com.chinaitop.agile.mapper"})
 public class DepotAgileApplication {
 

src/main/java/com/chinaitop/agile/controller/KcswController.java

@@ -41,12 +41,12 @@ public class KcswController {
 	private DataKcglFcbgzDefaultService fcbgzService;
 	
 	/**
-     * 根据id查询
+     * 首页柱形图
      * @param example 粮食业务
      * @return
      */
     @RequestMapping(value="/getDate", produces = MediaType.APPLICATION_JSON_VALUE, method = RequestMethod.GET)
-    @ApiOperation(value="根据id查询", notes = "根据id查询")
+    @ApiOperation(value="首页柱形图", notes = "")
 	@ApiImplicitParams({
 		@ApiImplicitParam(name = "orgId", value = "单位ID", paramType = "query")
 	})
@@ -69,12 +69,12 @@ public class KcswController {
 	}
     
     /**
-     * 根据等级分组查询
+     * 首页饼状图
      * @param example 粮食业务
      * @return
      */
     @RequestMapping(value="/getDateDj", produces = MediaType.APPLICATION_JSON_VALUE, method = RequestMethod.GET)
-    @ApiOperation(value="根据等级分组查询", notes = "等级分组查询")
+    @ApiOperation(value="首页饼状图", notes = "")
 	@ApiImplicitParams({
 		@ApiImplicitParam(name="orgId", value="单位ID", paramType="query")
 	})

src/main/java/com/chinaitop/agile/controller/KeepAccountController.java

@@ -172,6 +172,7 @@ public class KeepAccountController {
 		List<DataKcglFcbgzDefault> list = keepAccountService.queryTotalByExample(example);
 		for (DataKcglFcbgzDefault fcbgz : list) {
 			try {
+				fcbgz.setUnitid(orgId);
 				DataKcglFcbgzDefault obj = fcbgzService.findConditionMax(fcbgz);
 				fcbgz.setKcsl(obj.getKcsl());
 			} catch (Exception e) {

src/main/java/com/chinaitop/agile/feign/service/BasicEnumFeignService.java

@@ -0,0 +1,20 @@
+package com.chinaitop.agile.feign.service;
+
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.http.MediaType;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+
+@FeignClient(value = "depot-basic")
+public interface BasicEnumFeignService {
+
+	/**
+	 * 获取一条字典数据
+	 * @param username
+	 * @param password
+	 * @return
+	 */
+	@RequestMapping(value = "/Enum/findByEnum", produces = MediaType.APPLICATION_JSON_VALUE, method=RequestMethod.GET)
+	String getEnumData(@RequestParam("id") Integer id);
+}

src/main/java/com/chinaitop/agile/mapper/DataKcglKcswDefaultMapper.xml

@@ -419,7 +419,7 @@
   </select>
   
   <select id="countByDj" parameterType="java.util.Map" resultType="com.chinaitop.agile.model.DataKcswScedule">
-    select dj djmc ,ROUND(sum(kcsl/1000),2) sumCksl from data_kcgl_kcsw_default where UnitID=#{orgId} 
+    select dj djmc ,ROUND(sum(kcsl/1000),3) sumCksl from data_kcgl_kcsw_default where UnitID=#{orgId} 
       group by dj
   </select>
   

src/main/java/com/chinaitop/agile/service/impl/KcswServiceImpl.java

@@ -1,6 +1,7 @@
 package com.chinaitop.agile.service.impl;
 
 import com.alibaba.fastjson.JSONObject;
+import com.chinaitop.agile.feign.service.BasicEnumFeignService;
 import com.chinaitop.agile.mapper.DataKcglFcbgzDefaultMapper;
 import com.chinaitop.agile.mapper.DataKcglKcswDefaultMapper;
 import com.chinaitop.agile.mapper.DataKcglXckcDefaultMapper;
@@ -8,6 +9,8 @@ import com.chinaitop.agile.model.*;
 import com.chinaitop.agile.model.DataKcglKcswDefaultExample.Criteria;
 import com.chinaitop.agile.service.KcswService;
 import com.chinaitop.agile.utils.ParameterUtil;
+
+import org.apache.commons.lang.ObjectUtils;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -25,6 +28,8 @@ public class KcswServiceImpl implements KcswService{
 	private DataKcglXckcDefaultMapper dataKcglXckcDefaultMapper;
 	@Resource
 	private DataKcglFcbgzDefaultMapper dataKcglFcbgzDefaultMapper;
+	@Resource
+	private BasicEnumFeignService basicEnumFeignService;
 
 	public Map<String, Object> queryByExample(Integer orgId) {
 		/* 返回数据对象 */
@@ -42,44 +47,85 @@ public class KcswServiceImpl implements KcswService{
 		year_num[4] = this_year + "";
 		modelMap.put("years", year_num);
 
-		Map<String, Object> map = new HashMap<String, Object>();
-		map.put("orgId", orgId);
-		List<DataKcswScedule> countByLspz = dataKcglKcswDefaultMapper.countByLspz(map);
+		/* 查询库存数量表数据  */
+		DataKcglKcswDefaultExample example = new DataKcglKcswDefaultExample();
+		Criteria criteria = example.createCriteria();
+		criteria.andUnitidEqualTo(orgId+"");
+		List<DataKcglKcswDefault> list = dataKcglKcswDefaultMapper.selectByExample(example);
+
 		String pz = "";
-		String sumCksl = "";
-		double sumCkslDouble = 0d;
-		DecimalFormat obj = new DecimalFormat(".00");  // 保留2位小数
+		String year = "0";
+		DecimalFormat obj = new DecimalFormat(".0000");  // 保留4位小数
 		String sumCkslFormat = "";
-		//BigDecimal s = new BigDecimal(1000);
 		BigDecimal sumCksls = null;
-		//BigDecimal sumCkslss = null;
-		int year = 0;
+		
 		double []_xiaomai = new double[5];
 		double []_yumi = new double[5];
 		double []_daogu = new double[5];
 		double []_dadou = new double[5];
 		for (int i = 0; i < year_num.length; i++) {
-			for (DataKcswScedule dataKcswScedule : countByLspz) {
-				pz = dataKcswScedule.getPz();
-				year = Integer.parseInt(dataKcswScedule.getRq().substring(0, 4) + "");
-				dataKcswScedule.setRq(year+"");
-				sumCksl = dataKcswScedule.getSumCksl();
-				sumCkslDouble = Double.parseDouble(sumCksl);
-				sumCkslFormat = obj.format(sumCkslDouble);
-				sumCksls = new BigDecimal(sumCkslFormat);
-				//sumCkslss = sumCksls.divide(s);
-				if (year_num[i].equals(year+"")) {
-					if("3164".equals(pz)){
-						_xiaomai[i] = Double.parseDouble(sumCksls+"");
-					}else if ("3165".equals(pz)) {
-						_yumi[i] = Double.parseDouble(sumCksls+"");
-					}else if ("3166".equals(pz)) {
-						_daogu[i] = Double.parseDouble(sumCksls+"");
-					}else if ("2777".equals(pz)) {
-						_dadou[i] = Double.parseDouble(sumCksls+"");
+			double sumXiaomaikcsl = 0d; //小麦
+			double sumYumikcsl = 0d; //玉米
+			double sumDadoukcsl = 0d; //大豆
+			double sumDaogukcsl = 0d; //稻谷
+			if (null != list && list.size() > 0) {
+				for (DataKcglKcswDefault kcsw_obj : list) {
+					DataKcglFcbgzDefaultExample fcbgz_example = new DataKcglFcbgzDefaultExample();
+					DataKcglFcbgzDefaultExample.Criteria fcbgz_criteria = fcbgz_example.createCriteria();
+					fcbgz_criteria.andUnitidEqualTo(kcsw_obj.getUnitid());
+					fcbgz_criteria.andChEqualTo(kcsw_obj.getCh());
+					fcbgz_criteria.andHwhEqualTo(kcsw_obj.getHwh());
+					fcbgz_criteria.andSrslGreaterThan(0d);//收入数量大于0
+					fcbgz_example.setOrderByClause(" ModifyDate DESC");
+					//给生产年份赋值
+					List<DataKcglFcbgzDefault> fcbgz_list = dataKcglFcbgzDefaultMapper.selectByExample(fcbgz_example);
+					Integer scnf = 0;
+					if (null != fcbgz_list && fcbgz_list.size() > 0) {
+						scnf = Integer.parseInt(ObjectUtils.toString(fcbgz_list.get(0).getScnf(), "0"));
+					}
+
+					pz = kcsw_obj.getPz();
+					if (null == scnf || "".equals(scnf)) {
+						scnf = 0;
+					}
+					/* 获取年份的字典值 */
+					String strResult = basicEnumFeignService.getEnumData(scnf);
+					if (null != strResult && !"".equals(strResult)) {
+						JSONObject enum_obj = JSONObject.parseObject(strResult);
+						year = enum_obj.get("enumname")+"";//年份字典
+					} else {
+						year = "0";
+					}
+					if (year.equals(year_num[i]) && "3164".equals(pz)) {//这个年份小麦的数据
+						sumXiaomaikcsl = sumXiaomaikcsl + kcsw_obj.getKcsl();
+					} else if (year.equals(year_num[i]) && "3165".equals(pz)) {//这个年份玉米的数据
+						sumYumikcsl = sumYumikcsl + kcsw_obj.getKcsl();
+					} else if (year.equals(year_num[i]) && "3166".equals(pz)) {//这个年份稻谷的数据
+						sumDaogukcsl = sumDaogukcsl + kcsw_obj.getKcsl();
+					} else if (year.equals(year_num[i]) && "2777".equals(pz)) {//这个年份大豆的数据
+						sumDadoukcsl = sumDadoukcsl + kcsw_obj.getKcsl();
 					}
 				}
 			}
+			//处理小麦
+			sumCkslFormat = obj.format(sumXiaomaikcsl/1000);
+			sumCksls = new BigDecimal(sumCkslFormat);
+			_xiaomai[i] = Double.parseDouble(sumCksls+"");
+
+			//处理玉米
+			sumCkslFormat = obj.format(sumYumikcsl/1000);
+			sumCksls = new BigDecimal(sumCkslFormat);
+			_yumi[i] = Double.parseDouble(sumCksls+"");
+
+			//处理稻谷
+			sumCkslFormat = obj.format(sumDaogukcsl/1000);
+			sumCksls = new BigDecimal(sumCkslFormat);
+			_daogu[i] = Double.parseDouble(sumCksls+"");
+
+			//处理大豆
+			sumCkslFormat = obj.format(sumDadoukcsl/1000);
+			sumCksls = new BigDecimal(sumCkslFormat);
+			_dadou[i] = Double.parseDouble(sumCksls+"");
 		}
 
 		modelMap.put("xiaomai", _xiaomai);
@@ -111,7 +157,7 @@ public class KcswServiceImpl implements KcswService{
 		modelMap.put("yi", yi);
 		modelMap.put("er", er);
 		modelMap.put("san", san);
-		
+
 		return modelMap;
 	}
 
@@ -125,10 +171,13 @@ public class KcswServiceImpl implements KcswService{
 			BigDecimal divide = sumCksls2.divide(effectiveCapacitys, 4, RoundingMode.CEILING);
 			BigDecimal s = new BigDecimal(100);
 			BigDecimal multiply = divide.multiply(s);
-			String string = multiply.toString();
-//			double sumCkslDouble = Double.parseDouble(string);
-//			DecimalFormat obj = new DecimalFormat(".00");  // 保留2位小数
-//			String format = obj.format(sumCkslDouble);
+			float a = multiply.floatValue();
+			String string = "";
+			if (a > 100) {
+				string = "100";
+			} else {
+				string = multiply.toString();
+			}
 			return string;
 		}
 		return "0";