固定点位的水分数据类型更新

pom.xml

@@ -58,6 +58,10 @@
 			<artifactId>commons-lang3</artifactId>
 			<version>3.7</version>
 		</dependency>
+		<dependency>  
+		    <groupId>org.springframework.boot</groupId>  
+		    <artifactId>spring-boot-starter-security</artifactId>  
+		</dependency>
 
 		<!-- gbase依赖包 -->
 		<dependency>

src/main/java/com/chinaitop/WebSecurityConfig.java

@@ -0,0 +1,24 @@
+package com.chinaitop;
+
+import org.springframework.context.annotation.Configuration;
+import org.springframework.security.config.annotation.web.builders.HttpSecurity;
+import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
+import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
+
+@Configuration
+@EnableWebSecurity
+public class WebSecurityConfig 
+extends WebSecurityConfigurerAdapter 
+{
+
+	@Override
+    protected void configure(HttpSecurity http) throws Exception {
+		http.authorizeRequests()
+		.antMatchers("/**")
+		.permitAll() //允许所有用户访问所有资源
+        .and()
+        .csrf().disable(); // 禁用CSRF（防止伪造的跨域攻击）
+
+        super.configure(http);
+    }
+}

src/main/java/com/chinaitop/depot/storage/mapper/StorageWarterFixedPointMapper.xml

@@ -6,22 +6,22 @@
     <result column="z_id" property="zId" jdbcType="VARCHAR" />
     <result column="org_id" property="orgId" jdbcType="INTEGER" />
     <result column="qy" property="qy" jdbcType="INTEGER" />
-    <result column="zy_s" property="zyS" jdbcType="DECIMAL" />
-    <result column="zy_z" property="zyZ" jdbcType="DECIMAL" />
-    <result column="zy_x" property="zyX" jdbcType="DECIMAL" />
-    <result column="dn_s" property="dnS" jdbcType="DECIMAL" />
-    <result column="dn_z" property="dnZ" jdbcType="DECIMAL" />
-    <result column="dn_x" property="dnX" jdbcType="DECIMAL" />
-    <result column="db_s" property="dbS" jdbcType="DECIMAL" />
-    <result column="db_z" property="dbZ" jdbcType="DECIMAL" />
-    <result column="db_x" property="dbX" jdbcType="DECIMAL" />
-    <result column="xn_s" property="xnS" jdbcType="DECIMAL" />
-    <result column="xn_z" property="xnZ" jdbcType="DECIMAL" />
-    <result column="xn_x" property="xnX" jdbcType="DECIMAL" />
-    <result column="xb_s" property="xbS" jdbcType="DECIMAL" />
-    <result column="xb_z" property="xbZ" jdbcType="DECIMAL" />
-    <result column="xb_x" property="xbX" jdbcType="DECIMAL" />
-    <result column="avg_val" property="avgVal" jdbcType="DECIMAL" />
+    <result column="zy_s" property="zyS" jdbcType="VARCHAR" />
+    <result column="zy_z" property="zyZ" jdbcType="VARCHAR" />
+    <result column="zy_x" property="zyX" jdbcType="VARCHAR" />
+    <result column="dn_s" property="dnS" jdbcType="VARCHAR" />
+    <result column="dn_z" property="dnZ" jdbcType="VARCHAR" />
+    <result column="dn_x" property="dnX" jdbcType="VARCHAR" />
+    <result column="db_s" property="dbS" jdbcType="VARCHAR" />
+    <result column="db_z" property="dbZ" jdbcType="VARCHAR" />
+    <result column="db_x" property="dbX" jdbcType="VARCHAR" />
+    <result column="xn_s" property="xnS" jdbcType="VARCHAR" />
+    <result column="xn_z" property="xnZ" jdbcType="VARCHAR" />
+    <result column="xn_x" property="xnX" jdbcType="VARCHAR" />
+    <result column="xb_s" property="xbS" jdbcType="VARCHAR" />
+    <result column="xb_z" property="xbZ" jdbcType="VARCHAR" />
+    <result column="xb_x" property="xbX" jdbcType="VARCHAR" />
+    <result column="avg_val" property="avgVal" jdbcType="VARCHAR" />
     <result column="safe" property="safe" jdbcType="INTEGER" />
     <result column="input_time" property="inputTime" jdbcType="TIMESTAMP" />
     <result column="edit_time" property="editTime" jdbcType="TIMESTAMP" />
@@ -127,11 +127,11 @@
       avg_val, safe, input_time, 
       edit_time)
     values (#{id,jdbcType=VARCHAR}, #{zId,jdbcType=VARCHAR}, #{orgId,jdbcType=INTEGER}, 
-      #{qy,jdbcType=INTEGER}, #{zyS,jdbcType=DECIMAL}, #{zyZ,jdbcType=DECIMAL}, #{zyX,jdbcType=DECIMAL}, 
-      #{dnS,jdbcType=DECIMAL}, #{dnZ,jdbcType=DECIMAL}, #{dnX,jdbcType=DECIMAL}, #{dbS,jdbcType=DECIMAL}, 
-      #{dbZ,jdbcType=DECIMAL}, #{dbX,jdbcType=DECIMAL}, #{xnS,jdbcType=DECIMAL}, #{xnZ,jdbcType=DECIMAL}, 
-      #{xnX,jdbcType=DECIMAL}, #{xbS,jdbcType=DECIMAL}, #{xbZ,jdbcType=DECIMAL}, #{xbX,jdbcType=DECIMAL}, 
-      #{avgVal,jdbcType=DECIMAL}, #{safe,jdbcType=INTEGER}, #{inputTime,jdbcType=TIMESTAMP}, 
+      #{qy,jdbcType=INTEGER}, #{zyS,jdbcType=VARCHAR}, #{zyZ,jdbcType=VARCHAR}, #{zyX,jdbcType=VARCHAR}, 
+      #{dnS,jdbcType=VARCHAR}, #{dnZ,jdbcType=VARCHAR}, #{dnX,jdbcType=VARCHAR}, #{dbS,jdbcType=VARCHAR}, 
+      #{dbZ,jdbcType=VARCHAR}, #{dbX,jdbcType=VARCHAR}, #{xnS,jdbcType=VARCHAR}, #{xnZ,jdbcType=VARCHAR}, 
+      #{xnX,jdbcType=VARCHAR}, #{xbS,jdbcType=VARCHAR}, #{xbZ,jdbcType=VARCHAR}, #{xbX,jdbcType=VARCHAR}, 
+      #{avgVal,jdbcType=VARCHAR}, #{safe,jdbcType=INTEGER}, #{inputTime,jdbcType=TIMESTAMP}, 
       #{editTime,jdbcType=TIMESTAMP})
   </insert>
   <insert id="insertSelective" parameterType="com.chinaitop.depot.storage.model.StorageWarterFixedPoint" >
@@ -221,52 +221,52 @@
         #{qy,jdbcType=INTEGER},
       </if>
       <if test="zyS != null" >
-        #{zyS,jdbcType=DECIMAL},
+        #{zyS,jdbcType=VARCHAR},
       </if>
       <if test="zyZ != null" >
-        #{zyZ,jdbcType=DECIMAL},
+        #{zyZ,jdbcType=VARCHAR},
       </if>
       <if test="zyX != null" >
-        #{zyX,jdbcType=DECIMAL},
+        #{zyX,jdbcType=VARCHAR},
       </if>
       <if test="dnS != null" >
-        #{dnS,jdbcType=DECIMAL},
+        #{dnS,jdbcType=VARCHAR},
       </if>
       <if test="dnZ != null" >
-        #{dnZ,jdbcType=DECIMAL},
+        #{dnZ,jdbcType=VARCHAR},
       </if>
       <if test="dnX != null" >
-        #{dnX,jdbcType=DECIMAL},
+        #{dnX,jdbcType=VARCHAR},
       </if>
       <if test="dbS != null" >
-        #{dbS,jdbcType=DECIMAL},
+        #{dbS,jdbcType=VARCHAR},
       </if>
       <if test="dbZ != null" >
-        #{dbZ,jdbcType=DECIMAL},
+        #{dbZ,jdbcType=VARCHAR},
       </if>
       <if test="dbX != null" >
-        #{dbX,jdbcType=DECIMAL},
+        #{dbX,jdbcType=VARCHAR},
       </if>
       <if test="xnS != null" >
-        #{xnS,jdbcType=DECIMAL},
+        #{xnS,jdbcType=VARCHAR},
       </if>
       <if test="xnZ != null" >
-        #{xnZ,jdbcType=DECIMAL},
+        #{xnZ,jdbcType=VARCHAR},
       </if>
       <if test="xnX != null" >
-        #{xnX,jdbcType=DECIMAL},
+        #{xnX,jdbcType=VARCHAR},
       </if>
       <if test="xbS != null" >
-        #{xbS,jdbcType=DECIMAL},
+        #{xbS,jdbcType=VARCHAR},
       </if>
       <if test="xbZ != null" >
-        #{xbZ,jdbcType=DECIMAL},
+        #{xbZ,jdbcType=VARCHAR},
       </if>
       <if test="xbX != null" >
-        #{xbX,jdbcType=DECIMAL},
+        #{xbX,jdbcType=VARCHAR},
       </if>
       <if test="avgVal != null" >
-        #{avgVal,jdbcType=DECIMAL},
+        #{avgVal,jdbcType=VARCHAR},
       </if>
       <if test="safe != null" >
         #{safe,jdbcType=INTEGER},
@@ -301,52 +301,52 @@
         qy = #{record.qy,jdbcType=INTEGER},
       </if>
       <if test="record.zyS != null" >
-        zy_s = #{record.zyS,jdbcType=DECIMAL},
+        zy_s = #{record.zyS,jdbcType=VARCHAR},
       </if>
       <if test="record.zyZ != null" >
-        zy_z = #{record.zyZ,jdbcType=DECIMAL},
+        zy_z = #{record.zyZ,jdbcType=VARCHAR},
       </if>
       <if test="record.zyX != null" >
-        zy_x = #{record.zyX,jdbcType=DECIMAL},
+        zy_x = #{record.zyX,jdbcType=VARCHAR},
       </if>
       <if test="record.dnS != null" >
-        dn_s = #{record.dnS,jdbcType=DECIMAL},
+        dn_s = #{record.dnS,jdbcType=VARCHAR},
       </if>
       <if test="record.dnZ != null" >
-        dn_z = #{record.dnZ,jdbcType=DECIMAL},
+        dn_z = #{record.dnZ,jdbcType=VARCHAR},
       </if>
       <if test="record.dnX != null" >
-        dn_x = #{record.dnX,jdbcType=DECIMAL},
+        dn_x = #{record.dnX,jdbcType=VARCHAR},
       </if>
       <if test="record.dbS != null" >
-        db_s = #{record.dbS,jdbcType=DECIMAL},
+        db_s = #{record.dbS,jdbcType=VARCHAR},
       </if>
       <if test="record.dbZ != null" >
-        db_z = #{record.dbZ,jdbcType=DECIMAL},
+        db_z = #{record.dbZ,jdbcType=VARCHAR},
       </if>
       <if test="record.dbX != null" >
-        db_x = #{record.dbX,jdbcType=DECIMAL},
+        db_x = #{record.dbX,jdbcType=VARCHAR},
       </if>
       <if test="record.xnS != null" >
-        xn_s = #{record.xnS,jdbcType=DECIMAL},
+        xn_s = #{record.xnS,jdbcType=VARCHAR},
       </if>
       <if test="record.xnZ != null" >
-        xn_z = #{record.xnZ,jdbcType=DECIMAL},
+        xn_z = #{record.xnZ,jdbcType=VARCHAR},
       </if>
       <if test="record.xnX != null" >
-        xn_x = #{record.xnX,jdbcType=DECIMAL},
+        xn_x = #{record.xnX,jdbcType=VARCHAR},
       </if>
       <if test="record.xbS != null" >
-        xb_s = #{record.xbS,jdbcType=DECIMAL},
+        xb_s = #{record.xbS,jdbcType=VARCHAR},
       </if>
       <if test="record.xbZ != null" >
-        xb_z = #{record.xbZ,jdbcType=DECIMAL},
+        xb_z = #{record.xbZ,jdbcType=VARCHAR},
       </if>
       <if test="record.xbX != null" >
-        xb_x = #{record.xbX,jdbcType=DECIMAL},
+        xb_x = #{record.xbX,jdbcType=VARCHAR},
       </if>
       <if test="record.avgVal != null" >
-        avg_val = #{record.avgVal,jdbcType=DECIMAL},
+        avg_val = #{record.avgVal,jdbcType=VARCHAR},
       </if>
       <if test="record.safe != null" >
         safe = #{record.safe,jdbcType=INTEGER},
@@ -368,22 +368,22 @@
       z_id = #{record.zId,jdbcType=VARCHAR},
       org_id = #{record.orgId,jdbcType=INTEGER},
       qy = #{record.qy,jdbcType=INTEGER},
-      zy_s = #{record.zyS,jdbcType=DECIMAL},
-      zy_z = #{record.zyZ,jdbcType=DECIMAL},
-      zy_x = #{record.zyX,jdbcType=DECIMAL},
-      dn_s = #{record.dnS,jdbcType=DECIMAL},
-      dn_z = #{record.dnZ,jdbcType=DECIMAL},
-      dn_x = #{record.dnX,jdbcType=DECIMAL},
-      db_s = #{record.dbS,jdbcType=DECIMAL},
-      db_z = #{record.dbZ,jdbcType=DECIMAL},
-      db_x = #{record.dbX,jdbcType=DECIMAL},
-      xn_s = #{record.xnS,jdbcType=DECIMAL},
-      xn_z = #{record.xnZ,jdbcType=DECIMAL},
-      xn_x = #{record.xnX,jdbcType=DECIMAL},
-      xb_s = #{record.xbS,jdbcType=DECIMAL},
-      xb_z = #{record.xbZ,jdbcType=DECIMAL},
-      xb_x = #{record.xbX,jdbcType=DECIMAL},
-      avg_val = #{record.avgVal,jdbcType=DECIMAL},
+      zy_s = #{record.zyS,jdbcType=VARCHAR},
+      zy_z = #{record.zyZ,jdbcType=VARCHAR},
+      zy_x = #{record.zyX,jdbcType=VARCHAR},
+      dn_s = #{record.dnS,jdbcType=VARCHAR},
+      dn_z = #{record.dnZ,jdbcType=VARCHAR},
+      dn_x = #{record.dnX,jdbcType=VARCHAR},
+      db_s = #{record.dbS,jdbcType=VARCHAR},
+      db_z = #{record.dbZ,jdbcType=VARCHAR},
+      db_x = #{record.dbX,jdbcType=VARCHAR},
+      xn_s = #{record.xnS,jdbcType=VARCHAR},
+      xn_z = #{record.xnZ,jdbcType=VARCHAR},
+      xn_x = #{record.xnX,jdbcType=VARCHAR},
+      xb_s = #{record.xbS,jdbcType=VARCHAR},
+      xb_z = #{record.xbZ,jdbcType=VARCHAR},
+      xb_x = #{record.xbX,jdbcType=VARCHAR},
+      avg_val = #{record.avgVal,jdbcType=VARCHAR},
       safe = #{record.safe,jdbcType=INTEGER},
       input_time = #{record.inputTime,jdbcType=TIMESTAMP},
       edit_time = #{record.editTime,jdbcType=TIMESTAMP}
@@ -404,52 +404,52 @@
         qy = #{qy,jdbcType=INTEGER},
       </if>
       <if test="zyS != null" >
-        zy_s = #{zyS,jdbcType=DECIMAL},
+        zy_s = #{zyS,jdbcType=VARCHAR},
       </if>
       <if test="zyZ != null" >
-        zy_z = #{zyZ,jdbcType=DECIMAL},
+        zy_z = #{zyZ,jdbcType=VARCHAR},
       </if>
       <if test="zyX != null" >
-        zy_x = #{zyX,jdbcType=DECIMAL},
+        zy_x = #{zyX,jdbcType=VARCHAR},
       </if>
       <if test="dnS != null" >
-        dn_s = #{dnS,jdbcType=DECIMAL},
+        dn_s = #{dnS,jdbcType=VARCHAR},
       </if>
       <if test="dnZ != null" >
-        dn_z = #{dnZ,jdbcType=DECIMAL},
+        dn_z = #{dnZ,jdbcType=VARCHAR},
       </if>
       <if test="dnX != null" >
-        dn_x = #{dnX,jdbcType=DECIMAL},
+        dn_x = #{dnX,jdbcType=VARCHAR},
       </if>
       <if test="dbS != null" >
-        db_s = #{dbS,jdbcType=DECIMAL},
+        db_s = #{dbS,jdbcType=VARCHAR},
       </if>
       <if test="dbZ != null" >
-        db_z = #{dbZ,jdbcType=DECIMAL},
+        db_z = #{dbZ,jdbcType=VARCHAR},
       </if>
       <if test="dbX != null" >
-        db_x = #{dbX,jdbcType=DECIMAL},
+        db_x = #{dbX,jdbcType=VARCHAR},
       </if>
       <if test="xnS != null" >
-        xn_s = #{xnS,jdbcType=DECIMAL},
+        xn_s = #{xnS,jdbcType=VARCHAR},
       </if>
       <if test="xnZ != null" >
-        xn_z = #{xnZ,jdbcType=DECIMAL},
+        xn_z = #{xnZ,jdbcType=VARCHAR},
       </if>
       <if test="xnX != null" >
-        xn_x = #{xnX,jdbcType=DECIMAL},
+        xn_x = #{xnX,jdbcType=VARCHAR},
       </if>
       <if test="xbS != null" >
-        xb_s = #{xbS,jdbcType=DECIMAL},
+        xb_s = #{xbS,jdbcType=VARCHAR},
       </if>
       <if test="xbZ != null" >
-        xb_z = #{xbZ,jdbcType=DECIMAL},
+        xb_z = #{xbZ,jdbcType=VARCHAR},
       </if>
       <if test="xbX != null" >
-        xb_x = #{xbX,jdbcType=DECIMAL},
+        xb_x = #{xbX,jdbcType=VARCHAR},
       </if>
       <if test="avgVal != null" >
-        avg_val = #{avgVal,jdbcType=DECIMAL},
+        avg_val = #{avgVal,jdbcType=VARCHAR},
       </if>
       <if test="safe != null" >
         safe = #{safe,jdbcType=INTEGER},
@@ -468,22 +468,22 @@
     set z_id = #{zId,jdbcType=VARCHAR},
       org_id = #{orgId,jdbcType=INTEGER},
       qy = #{qy,jdbcType=INTEGER},
-      zy_s = #{zyS,jdbcType=DECIMAL},
-      zy_z = #{zyZ,jdbcType=DECIMAL},
-      zy_x = #{zyX,jdbcType=DECIMAL},
-      dn_s = #{dnS,jdbcType=DECIMAL},
-      dn_z = #{dnZ,jdbcType=DECIMAL},
-      dn_x = #{dnX,jdbcType=DECIMAL},
-      db_s = #{dbS,jdbcType=DECIMAL},
-      db_z = #{dbZ,jdbcType=DECIMAL},
-      db_x = #{dbX,jdbcType=DECIMAL},
-      xn_s = #{xnS,jdbcType=DECIMAL},
-      xn_z = #{xnZ,jdbcType=DECIMAL},
-      xn_x = #{xnX,jdbcType=DECIMAL},
-      xb_s = #{xbS,jdbcType=DECIMAL},
-      xb_z = #{xbZ,jdbcType=DECIMAL},
-      xb_x = #{xbX,jdbcType=DECIMAL},
-      avg_val = #{avgVal,jdbcType=DECIMAL},
+      zy_s = #{zyS,jdbcType=VARCHAR},
+      zy_z = #{zyZ,jdbcType=VARCHAR},
+      zy_x = #{zyX,jdbcType=VARCHAR},
+      dn_s = #{dnS,jdbcType=VARCHAR},
+      dn_z = #{dnZ,jdbcType=VARCHAR},
+      dn_x = #{dnX,jdbcType=VARCHAR},
+      db_s = #{dbS,jdbcType=VARCHAR},
+      db_z = #{dbZ,jdbcType=VARCHAR},
+      db_x = #{dbX,jdbcType=VARCHAR},
+      xn_s = #{xnS,jdbcType=VARCHAR},
+      xn_z = #{xnZ,jdbcType=VARCHAR},
+      xn_x = #{xnX,jdbcType=VARCHAR},
+      xb_s = #{xbS,jdbcType=VARCHAR},
+      xb_z = #{xbZ,jdbcType=VARCHAR},
+      xb_x = #{xbX,jdbcType=VARCHAR},
+      avg_val = #{avgVal,jdbcType=VARCHAR},
       safe = #{safe,jdbcType=INTEGER},
       input_time = #{inputTime,jdbcType=TIMESTAMP},
       edit_time = #{editTime,jdbcType=TIMESTAMP}

src/main/java/com/chinaitop/depot/storage/model/StorageQualitycheck.java

@@ -57,7 +57,7 @@ public class StorageQualitycheck {
 
     private Integer warehouseId;
 
-    private String typeUpdate;//质量检查类型:0:初检 1：验收 2：春秋普查 3：出库检验 4：日常检验 5：第三方检查
+    private String typeUpdate;//质量检查类型:0:初检或自检 1：验收 2：春秋普查 3：出库检验 4：日常检验(春秋普查) 5：第三方检查,6:入仓初检(入库检验)
 
     private Integer subType;//粮食品种在字典表的id
 
@@ -75,10 +75,18 @@ public class StorageQualitycheck {
     @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date zhycsj;
 
+    /**
+     * 质量检查类型:0:初检或自检 1：验收 2：春秋普查 3：出库检验 4：日常检验(春秋普查) 5：第三方检查,6:入仓初检(入库检验)
+     * @return
+     */
     public String getTypeUpdate() {
         return typeUpdate;
     }
 
+    /**
+     * 质量检查类型:0:初检或自检 1：验收 2：春秋普查 3：出库检验 4：日常检验(春秋普查) 5：第三方检查,6:入仓初检(入库检验)
+     * @param typeUpdate
+     */
     public void setTypeUpdate(String typeUpdate) {
         this.typeUpdate = typeUpdate;
     }

src/main/java/com/chinaitop/depot/storage/model/StorageWarterFixedPoint.java

@@ -1,6 +1,5 @@
 package com.chinaitop.depot.storage.model;
 
-import java.math.BigDecimal;
 import java.util.Date;
 
 public class StorageWarterFixedPoint {
@@ -12,37 +11,37 @@ public class StorageWarterFixedPoint {
 
     private Integer qy;
 
-    private BigDecimal zyS;
+    private String zyS;
 
-    private BigDecimal zyZ;
+    private String zyZ;
 
-    private BigDecimal zyX;
+    private String zyX;
 
-    private BigDecimal dnS;
+    private String dnS;
 
-    private BigDecimal dnZ;
+    private String dnZ;
 
-    private BigDecimal dnX;
+    private String dnX;
 
-    private BigDecimal dbS;
+    private String dbS;
 
-    private BigDecimal dbZ;
+    private String dbZ;
 
-    private BigDecimal dbX;
+    private String dbX;
 
-    private BigDecimal xnS;
+    private String xnS;
 
-    private BigDecimal xnZ;
+    private String xnZ;
 
-    private BigDecimal xnX;
+    private String xnX;
 
-    private BigDecimal xbS;
+    private String xbS;
 
-    private BigDecimal xbZ;
+    private String xbZ;
 
-    private BigDecimal xbX;
+    private String xbX;
 
-    private BigDecimal avgVal;
+    private String avgVal;
 
     private Integer safe;
 
@@ -118,7 +117,7 @@ public class StorageWarterFixedPoint {
      * null
      * @return zy_s null
      */
-    public BigDecimal getZyS() {
+    public String getZyS() {
         return zyS;
     }
 
@@ -126,7 +125,7 @@ public class StorageWarterFixedPoint {
      * null
      * @param zyS null
      */
-    public void setZyS(BigDecimal zyS) {
+    public void setZyS(String zyS) {
         this.zyS = zyS;
     }
 
@@ -134,7 +133,7 @@ public class StorageWarterFixedPoint {
      * null
      * @return zy_z null
      */
-    public BigDecimal getZyZ() {
+    public String getZyZ() {
         return zyZ;
     }
 
@@ -142,7 +141,7 @@ public class StorageWarterFixedPoint {
      * null
      * @param zyZ null
      */
-    public void setZyZ(BigDecimal zyZ) {
+    public void setZyZ(String zyZ) {
         this.zyZ = zyZ;
     }
 
@@ -150,7 +149,7 @@ public class StorageWarterFixedPoint {
      * null
      * @return zy_x null
      */
-    public BigDecimal getZyX() {
+    public String getZyX() {
         return zyX;
     }
 
@@ -158,7 +157,7 @@ public class StorageWarterFixedPoint {
      * null
      * @param zyX null
      */
-    public void setZyX(BigDecimal zyX) {
+    public void setZyX(String zyX) {
         this.zyX = zyX;
     }
 
@@ -166,7 +165,7 @@ public class StorageWarterFixedPoint {
      * null
      * @return dn_s null
      */
-    public BigDecimal getDnS() {
+    public String getDnS() {
         return dnS;
     }
 
@@ -174,7 +173,7 @@ public class StorageWarterFixedPoint {
      * null
      * @param dnS null
      */
-    public void setDnS(BigDecimal dnS) {
+    public void setDnS(String dnS) {
         this.dnS = dnS;
     }
 
@@ -182,7 +181,7 @@ public class StorageWarterFixedPoint {
      * null
      * @return dn_z null
      */
-    public BigDecimal getDnZ() {
+    public String getDnZ() {
         return dnZ;
     }
 
@@ -190,7 +189,7 @@ public class StorageWarterFixedPoint {
      * null
      * @param dnZ null
      */
-    public void setDnZ(BigDecimal dnZ) {
+    public void setDnZ(String dnZ) {
         this.dnZ = dnZ;
     }
 
@@ -198,7 +197,7 @@ public class StorageWarterFixedPoint {
      * null
      * @return dn_x null
      */
-    public BigDecimal getDnX() {
+    public String getDnX() {
         return dnX;
     }
 
@@ -206,7 +205,7 @@ public class StorageWarterFixedPoint {
      * null
      * @param dnX null
      */
-    public void setDnX(BigDecimal dnX) {
+    public void setDnX(String dnX) {
         this.dnX = dnX;
     }
 
@@ -214,7 +213,7 @@ public class StorageWarterFixedPoint {
      * null
      * @return db_s null
      */
-    public BigDecimal getDbS() {
+    public String getDbS() {
         return dbS;
     }
 
@@ -222,7 +221,7 @@ public class StorageWarterFixedPoint {
      * null
      * @param dbS null
      */
-    public void setDbS(BigDecimal dbS) {
+    public void setDbS(String dbS) {
         this.dbS = dbS;
     }
 
@@ -230,7 +229,7 @@ public class StorageWarterFixedPoint {
      * null
      * @return db_z null
      */
-    public BigDecimal getDbZ() {
+    public String getDbZ() {
         return dbZ;
     }
 
@@ -238,7 +237,7 @@ public class StorageWarterFixedPoint {
      * null
      * @param dbZ null
      */
-    public void setDbZ(BigDecimal dbZ) {
+    public void setDbZ(String dbZ) {
         this.dbZ = dbZ;
     }
 
@@ -246,7 +245,7 @@ public class StorageWarterFixedPoint {
      * null
      * @return db_x null
      */
-    public BigDecimal getDbX() {
+    public String getDbX() {
         return dbX;
     }
 
@@ -254,7 +253,7 @@ public class StorageWarterFixedPoint {
      * null
      * @param dbX null
      */
-    public void setDbX(BigDecimal dbX) {
+    public void setDbX(String dbX) {
         this.dbX = dbX;
     }
 
@@ -262,7 +261,7 @@ public class StorageWarterFixedPoint {
      * null
      * @return xn_s null
      */
-    public BigDecimal getXnS() {
+    public String getXnS() {
         return xnS;
     }
 
@@ -270,7 +269,7 @@ public class StorageWarterFixedPoint {
      * null
      * @param xnS null
      */
-    public void setXnS(BigDecimal xnS) {
+    public void setXnS(String xnS) {
         this.xnS = xnS;
     }
 
@@ -278,7 +277,7 @@ public class StorageWarterFixedPoint {
      * null
      * @return xn_z null
      */
-    public BigDecimal getXnZ() {
+    public String getXnZ() {
         return xnZ;
     }
 
@@ -286,7 +285,7 @@ public class StorageWarterFixedPoint {
      * null
      * @param xnZ null
      */
-    public void setXnZ(BigDecimal xnZ) {
+    public void setXnZ(String xnZ) {
         this.xnZ = xnZ;
     }
 
@@ -294,7 +293,7 @@ public class StorageWarterFixedPoint {
      * null
      * @return xn_x null
      */
-    public BigDecimal getXnX() {
+    public String getXnX() {
         return xnX;
     }
 
@@ -302,7 +301,7 @@ public class StorageWarterFixedPoint {
      * null
      * @param xnX null
      */
-    public void setXnX(BigDecimal xnX) {
+    public void setXnX(String xnX) {
         this.xnX = xnX;
     }
 
@@ -310,7 +309,7 @@ public class StorageWarterFixedPoint {
      * null
      * @return xb_s null
      */
-    public BigDecimal getXbS() {
+    public String getXbS() {
         return xbS;
     }
 
@@ -318,7 +317,7 @@ public class StorageWarterFixedPoint {
      * null
      * @param xbS null
      */
-    public void setXbS(BigDecimal xbS) {
+    public void setXbS(String xbS) {
         this.xbS = xbS;
     }
 
@@ -326,7 +325,7 @@ public class StorageWarterFixedPoint {
      * null
      * @return xb_z null
      */
-    public BigDecimal getXbZ() {
+    public String getXbZ() {
         return xbZ;
     }
 
@@ -334,7 +333,7 @@ public class StorageWarterFixedPoint {
      * null
      * @param xbZ null
      */
-    public void setXbZ(BigDecimal xbZ) {
+    public void setXbZ(String xbZ) {
         this.xbZ = xbZ;
     }
 
@@ -342,7 +341,7 @@ public class StorageWarterFixedPoint {
      * null
      * @return xb_x null
      */
-    public BigDecimal getXbX() {
+    public String getXbX() {
         return xbX;
     }
 
@@ -350,7 +349,7 @@ public class StorageWarterFixedPoint {
      * null
      * @param xbX null
      */
-    public void setXbX(BigDecimal xbX) {
+    public void setXbX(String xbX) {
         this.xbX = xbX;
     }
 
@@ -358,7 +357,7 @@ public class StorageWarterFixedPoint {
      * null
      * @return avg_val null
      */
-    public BigDecimal getAvgVal() {
+    public String getAvgVal() {
         return avgVal;
     }
 
@@ -366,7 +365,7 @@ public class StorageWarterFixedPoint {
      * null
      * @param avgVal null
      */
-    public void setAvgVal(BigDecimal avgVal) {
+    public void setAvgVal(String avgVal) {
         this.avgVal = avgVal;
     }
 

src/main/resources/bootstrap.yml

@@ -7,7 +7,7 @@ server:
 eureka:
   client:
     service-url:
-      defaultZone: http://localhost:9001/eureka/
+      defaultZone: http://tj_admin:Admin_1234@${eureka.instance.hostname}:9001/eureka/
   instance:
     hostname: 172.16.0.16
     prefer-ip-address: true
@@ -20,6 +20,10 @@ eureka:
 mybatis:
   config-location: classpath:mybatis/mybatis-config.xml
 
+management:
+  server:
+    port: -1
+
 spring:
   application:
     name: depot-qualitycheck
@@ -29,7 +33,7 @@ spring:
     url: jdbc:gbasedbt-sqli://101.36.160.140:19089/depot:INFORMIXSERVER=gbaseserver;NEWCODESET=GB18030,GB18030-2000,5488;DB_LOCALE=zh_cn.GB18030-2000;GL_USEGLU=1;IFX_USE_STRENC=true;characterEncoding=utf8;
     username: gbasedbt
     password: cDbK2S0go8
-    #url: jdbc:gbasedbt-sqli://111.164.113.172:666/depot:INFORMIXSERVER=gbaseserver;NEWCODESET=GBK,8859-1,819;GL_USEGLU=1;IFX_USE_STRENC=true;characterEncoding=utf8;
+    #url: jdbc:gbasedbt-sqli://10.223.3.63:9088/depot:INFORMIXSERVER=gbaseserver;NEWCODESET=GBK,8859-1,819;GL_USEGLU=1;IFX_USE_STRENC=true;characterEncoding=utf8;
     #username: gbasedbt
     #password: GBase123
     driver-class-name: com.gbasedbt.jdbc.IfxDriver
@@ -57,7 +61,7 @@ spring:
 #    time-zone: GMT+8
  
 web:
-  upload-path: /home/depot/depot-web/apache-tomcat-8.0.53/webapps/ROOT/WEB-INF/classes/static
+  upload-path: /home/depot/depot-web/depot-file
 cxf:
   path: /quality
 #出入库生成库存接口