首页粮食柱形图

src/main/java/com/chinaitop/agile/mapper/BasicEnumMapper.java

@@ -0,0 +1,9 @@
+package com.chinaitop.agile.mapper;
+
+
+import com.chinaitop.agile.model.BasicEnum;
+
+public interface BasicEnumMapper {
+
+    BasicEnum selectByPrimaryKey(Integer enumid);
+}

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

@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.chinaitop.agile.mapper.BasicEnumMapper" >
+  <resultMap id="BaseResultMap" type="com.chinaitop.agile.model.BasicEnum" >
+    <id column="enumId" property="enumid" jdbcType="INTEGER" />
+    <result column="enumCode" property="enumcode" jdbcType="VARCHAR" />
+    <result column="enumName" property="enumname" jdbcType="VARCHAR" />
+    <result column="gbCode" property="gbcode" jdbcType="VARCHAR" />
+    <result column="parentId" property="parentid" jdbcType="INTEGER" />
+    <result column="createDate" property="createdate" jdbcType="TIMESTAMP" />
+    <result column="remark" property="remark" jdbcType="VARCHAR" />
+    <result column="delFlag" property="delflag" jdbcType="INTEGER" />
+  </resultMap>
+  <sql id="Example_Where_Clause" >
+    <where >
+      <foreach collection="oredCriteria" item="criteria" separator="or" >
+        <if test="criteria.valid" >
+          <trim prefix="(" suffix=")" prefixOverrides="and" >
+            <foreach collection="criteria.criteria" item="criterion" >
+              <choose >
+                <when test="criterion.noValue" >
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue" >
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue" >
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue" >
+                  and ${criterion.condition}
+                  <foreach collection="criterion.value" item="listItem" open="(" close=")" separator="," >
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Update_By_Example_Where_Clause" >
+    <where >
+      <foreach collection="example.oredCriteria" item="criteria" separator="or" >
+        <if test="criteria.valid" >
+          <trim prefix="(" suffix=")" prefixOverrides="and" >
+            <foreach collection="criteria.criteria" item="criterion" >
+              <choose >
+                <when test="criterion.noValue" >
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue" >
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue" >
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue" >
+                  and ${criterion.condition}
+                  <foreach collection="criterion.value" item="listItem" open="(" close=")" separator="," >
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Base_Column_List" >
+    enumId, enumCode, enumName, gbCode, parentId, createDate, remark, delFlag
+  </sql>
+  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
+    select 
+    <include refid="Base_Column_List" />
+    from basic_enum
+    where enumId = #{enumid,jdbcType=INTEGER}
+  </select>
+
+</mapper>

src/main/java/com/chinaitop/agile/model/BasicEnum.java

@@ -0,0 +1,160 @@
+package com.chinaitop.agile.model;
+
+import java.util.Date;
+import java.util.List;
+
+public class BasicEnum {
+    private Integer enumid;
+
+    private String enumcode;
+
+    private String enumname;
+
+    private String gbcode;
+
+    private Integer parentid;
+
+    private Date createdate;
+
+    private String remark;
+
+    private Integer delflag;
+    
+    private List<BasicEnum> children;
+
+    public List<BasicEnum> getChildren() {
+		return children;
+	}
+
+	public void setChildren(List<BasicEnum> children) {
+		this.children = children;
+	}
+
+	/**
+     * ID
+     * @return enumId ID
+     */
+    public Integer getEnumid() {
+        return enumid;
+    }
+
+    /**
+     * ID
+     * @param enumid ID
+     */
+    public void setEnumid(Integer enumid) {
+        this.enumid = enumid;
+    }
+
+    /**
+     * 枚举编码
+     * @return enumCode 枚举编码
+     */
+    public String  getEnumcode() {
+        return enumcode;
+    }
+
+    /**
+     * 枚举编码
+     * @param enumcode 枚举编码
+     */
+    public void setEnumcode(String enumcode) {
+        this.enumcode = enumcode == null ? null : enumcode.trim();
+    }
+
+    /**
+     * 枚举名称
+     * @return enumName 枚举名称
+     */
+    public String getEnumname() {
+        return enumname;
+    }
+
+    /**
+     * 枚举名称
+     * @param enumname 枚举名称
+     */
+    public void setEnumname(String enumname) {
+        this.enumname = enumname == null ? null : enumname.trim();
+    }
+
+    /**
+     * 国标编码
+     * @return gbCode 国标编码
+     */
+    public String getGbcode() {
+        return gbcode;
+    }
+
+    /**
+     * 国标编码
+     * @param gbcode 国标编码
+     */
+    public void setGbcode(String gbcode) {
+        this.gbcode = gbcode == null ? null : gbcode.trim();
+    }
+
+    /**
+     * 父级ID
+     * @return parentId 父级ID
+     */
+    public Integer getParentid() {
+        return parentid;
+    }
+
+    /**
+     * 父级ID
+     * @param parentid 父级ID
+     */
+    public void setParentid(Integer parentid) {
+        this.parentid = parentid;
+    }
+
+    /**
+     * 创建时间
+     * @return createDate 创建时间
+     */
+    public Date getCreatedate() {
+        return createdate;
+    }
+
+    /**
+     * 创建时间
+     * @param createdate 创建时间
+     */
+    public void setCreatedate(Date createdate) {
+        this.createdate = createdate;
+    }
+
+    /**
+     * 备注
+     * @return remark 备注
+     */
+    public String getRemark() {
+        return remark;
+    }
+
+    /**
+     * 备注
+     * @param remark 备注
+     */
+    public void setRemark(String remark) {
+        this.remark = remark == null ? null : remark.trim();
+    }
+
+    /**
+     * 删除状态(1.正常，2.删除)
+     * @return delFlag 删除状态(1.正常，2.删除)
+     */
+    public Integer getDelflag() {
+        return delflag;
+    }
+
+    /**
+     * 删除状态(1.正常，2.删除)
+     * @param delflag 删除状态(1.正常，2.删除)
+     */
+    public void setDelflag(Integer delflag) {
+        this.delflag = delflag;
+    }
+}

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

@@ -11,6 +11,8 @@ import java.util.UUID;
 
 import javax.annotation.Resource;
 
+import com.chinaitop.agile.mapper.BasicEnumMapper;
+import com.chinaitop.agile.model.*;
 import org.apache.commons.lang.ObjectUtils;
 import org.springframework.stereotype.Service;
 
@@ -19,13 +21,7 @@ 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;
-import com.chinaitop.agile.model.DataKcglFcbgzDefault;
-import com.chinaitop.agile.model.DataKcglFcbgzDefaultExample;
-import com.chinaitop.agile.model.DataKcglKcswDefault;
-import com.chinaitop.agile.model.DataKcglKcswDefaultExample;
 import com.chinaitop.agile.model.DataKcglKcswDefaultExample.Criteria;
-import com.chinaitop.agile.model.DataKcglXckcDefault;
-import com.chinaitop.agile.model.DataKcswScedule;
 import com.chinaitop.agile.service.KcswService;
 import com.chinaitop.agile.utils.ParameterUtil;
 
@@ -40,6 +36,8 @@ public class KcswServiceImpl implements KcswService{
 	private DataKcglFcbgzDefaultMapper dataKcglFcbgzDefaultMapper;
 	@Resource
 	private BasicEnumFeignService basicEnumFeignService;
+	@Resource
+	private BasicEnumMapper enumMapper;
 
 	public Map<String, Object> queryByExample(Integer orgId) {
 		/* 返回数据对象 */
@@ -93,16 +91,15 @@ public class KcswServiceImpl implements KcswService{
 					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);
+					BasicEnum strResult = enumMapper.selectByPrimaryKey(scnf);
 					if (null != strResult && !"".equals(strResult)) {
-						JSONObject enum_obj = JSONObject.parseObject(strResult);
-						year = enum_obj.get("enumname")+"";//年份字典
+						year =strResult.getEnumname();
+
 					} else {
 						year = "0";
 					}