虫害检查-01

pom.xml

@@ -72,11 +72,11 @@
 		</dependency>
 
 		<!--log4j-->
-		<dependency>
+		<!--<dependency>
 			<groupId>log4j</groupId>
 			<artifactId>log4j</artifactId>
 			<version>1.2.17</version>
-		</dependency>
+		</dependency>-->
 
 		<dependency>
 			<groupId>org.springframework.boot</groupId>

src/main/java/com/chinaitop/depot/storage/controller/InsectPestDetectionController.java

@@ -6,6 +6,7 @@ import java.util.Map;
 
 import javax.annotation.Resource;
 
+import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
@@ -150,4 +151,16 @@ public class InsectPestDetectionController {
         List<TCcdata> tccdataList = insectPestDetectionService.getInsectPestDeatil(example);
         return ResponseEntity.ok(tccdataList);
     }
+
+    // getCheckGrainAttribute
+    @RequestMapping(value = "/getCheckGrainAttribute/{orgId}/{houseId}/{warehouseId}", method = RequestMethod.GET)
+    @ApiOperation(value = "查询粮食品种,库存数量(吨)", notes = "粮食品种,库存数量(吨)")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "orgId", value = "机构id", paramType = "path"),
+            @ApiImplicitParam(name = "houseId", value = "仓房id", paramType = "path"),
+            @ApiImplicitParam(name = "warehouseId", value = "货位id", paramType = "path")
+    })
+    public ResponseEntity getCheckGrainAttribute(@PathVariable("orgId") Integer orgId, @PathVariable("houseId") Integer houseId, @PathVariable("warehouseId") Integer warehouseId) {
+        return ResponseEntity.ok(insectPestDetectionService.getCheckGrainAttribute(orgId, houseId, warehouseId));
+    }
 }

src/main/java/com/chinaitop/depot/storage/mapper/TCcdataMapper.java

@@ -38,4 +38,15 @@ public interface TCcdataMapper {
      * @return
      */
     List<Map<String,Object>> getJcd(Map<String, Object> map);
+
+    /**
+     * 查询最后一个检测单号
+     * @return
+     */
+    String getLastJCDH();
+
+    // 获取廒间编码-查询视图(货位id)
+    String getAJBM(@Param("hwCode") String hwCode);
+
+    TCcdata getCheckGrainAttribute(@Param("orgId") Integer orgId, @Param("houseId") Integer houseId, @Param("warehouseId") Integer warehouseId);
 }

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

@@ -21,6 +21,10 @@
     <result column="hckyxfx" property="hckyxfx" jdbcType="VARCHAR" />
     <result column="fsbw" property="fsbw" jdbcType="VARCHAR" />
     <result column="hcjcdh" property="hcjcdh" jdbcType="VARCHAR" />
+    <result column="lypz" property="lypz" jdbcType="INTEGER" />
+    <result column="kcsl" property="kcsl" jdbcType="VARCHAR" />
+    <result column="commit_people" property="commitPeople" jdbcType="VARCHAR" />
+    <result column="commit_time" property="commitTime" jdbcType="TIMESTAMP" />
   </resultMap>
   <resultMap id="ResultMapWithBLOBs" type="com.chinaitop.depot.storage.model.TCcdata" extends="BaseResultMap" >
     <result column="c_image" property="cImage" jdbcType="LONGVARBINARY" />
@@ -86,7 +90,8 @@
   </sql>
   <sql id="Base_Column_List" >
     id, org_id, v_cc_code, v_hw_code, stand_or, stand_time, i_tdh, i_value, v_update_time, 
-    v_update_people, data_source, v_remark, updatetime, jchcff, hczl, cldjpd, hckyxfx, fsbw, hcjcdh
+    v_update_people, data_source, v_remark, updatetime, jchcff, hczl, cldjpd, hckyxfx, fsbw, hcjcdh,
+    lypz, kcsl, commit_people, commit_time
   </sql>
   <sql id="Blob_Column_List" >
     c_image, ckmdzjh
@@ -135,7 +140,7 @@
       i_tdh, i_value, v_update_time, 
       v_update_people, data_source, v_remark, 
       updatetime, jchcff, hczl, 
-      cldjpd, hckyxfx, c_image, ckmdzjh,fsbw, hcjcdh
+      cldjpd, hckyxfx, c_image, ckmdzjh,fsbw, hcjcdh, lypz, kcsl, commit_people, commit_time
       )
     values (#{id,jdbcType=VARCHAR}, #{orgId,jdbcType=VARCHAR}, #{vCcCode,jdbcType=VARCHAR}, 
       #{vHwCode,jdbcType=VARCHAR}, #{standOr,jdbcType=VARCHAR}, #{standTime,jdbcType=TIMESTAMP}, 
@@ -143,7 +148,8 @@
       #{vUpdatePeople,jdbcType=VARCHAR}, #{dataSource,jdbcType=VARCHAR}, #{vRemark,jdbcType=VARCHAR}, 
       #{updatetime,jdbcType=TIMESTAMP}, #{jchcff,jdbcType=VARCHAR}, #{hczl,jdbcType=VARCHAR}, 
       #{cldjpd,jdbcType=VARCHAR}, #{hckyxfx,jdbcType=VARCHAR}, #{cImage,jdbcType=LONGVARBINARY},
-      #{ckmdzjh,jdbcType=LONGVARBINARY},#{fsbw,jdbcType=VARCHAR},#{hcjcdh,jdbcType=VARCHAR}
+      #{ckmdzjh,jdbcType=LONGVARBINARY},#{fsbw,jdbcType=VARCHAR},#{hcjcdh,jdbcType=VARCHAR},
+      #{lypz,jdbcType=INTEGER},#{kcsl,jdbcType=VARCHAR},#{commitPeople,jdbcType=VARCHAR},#{commitTime,jdbcType=TIMESTAMP}
       )
   </insert>
   <insert id="insertSelective" parameterType="com.chinaitop.depot.storage.model.TCcdata" >
@@ -212,6 +218,18 @@
       <if test="hcjcdh != null">
         hcjcdh,
       </if>
+      <if test="lypz != null">
+        lypz,
+      </if>
+      <if test="kcsl != null">
+        kcsl,
+      </if>
+      <if test="commitPeople != null">
+        commit_people,
+      </if>
+      <if test="commitTime != null">
+        commit_time,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides="," >
       <if test="id != null" >
@@ -277,6 +295,18 @@
       <if test="hcjcdh != null">
         #{hcjcdh,jdbcType=VARCHAR},
       </if>
+      <if test="lypz != null">
+        #{lypz,jdbcType=VARCHAR},
+      </if>
+      <if test="kcsl != null">
+        #{kcsl,jdbcType=VARCHAR},
+      </if>
+      <if test="commitPeople != null">
+        #{commitPeople,jdbcType=INTEGER},
+      </if>
+      <if test="commitTime != null">
+        #{commitTime,jdbcType=TIMESTAMP},
+      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="com.chinaitop.depot.storage.model.TCcdataExample" resultType="java.lang.Integer" >
@@ -351,6 +381,18 @@
       <if test="record.hcjcdh != null">
         hcjcdh = #{record.hcjcdh,jdbcType=VARCHAR},
       </if>
+      <if test="record.lypz != null">
+        lypz = #{record.lypz,jdbcType=INTEGER},
+      </if>
+      <if test="record.kcsl != null">
+        kcsl = #{record.kcsl,jdbcType=VARCHAR},
+      </if>
+      <if test="record.commitPeople != null">
+        commit_people = #{record.commitPeople,jdbcType=VARCHAR},
+      </if>
+      <if test="record.commitTime != null">
+        commit_time = #{record.commitTime,jdbcType=TIMESTAMP},
+      </if>
     </set>
     <if test="_parameter != null" >
       <include refid="Update_By_Example_Where_Clause" />
@@ -377,7 +419,11 @@
       c_image = #{record.cImage,jdbcType=LONGVARBINARY},
       ckmdzjh = #{record.ckmdzjh,jdbcType=LONGVARBINARY},
       fsbw = #{record.fsbw,jdbcType=VARCHAR},
-      hcjcdh = #{record.hcjcdh,jdbcType=VARCHAR}
+      hcjcdh = #{record.hcjcdh,jdbcType=VARCHAR},
+      lypz = #{record.lypz,jdbcType=INTEGER},
+      kcsl = #{record.kcsl,jdbcType=VARCHAR},
+      commit_people = #{record.commitPeople,jdbcType=VARCHAR},
+      commit_time = #{record.commitTime,jdbcType=TIMESTAMP}
     <if test="_parameter != null" >
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -403,7 +449,11 @@
       c_image = #{cImage,jdbcType=LONGVARBINARY},
       ckmdzjh = #{ckmdzjh,jdbcType=LONGVARBINARY},
       fsbw = #{fsbw,jdbcType=VARCHAR},
-      hcjcdh = #{hcjcdh,jdbcType=VARCHAR}
+      hcjcdh = #{hcjcdh,jdbcType=VARCHAR},
+      lypz = #{record.lypz,jdbcType=INTEGER},
+      kcsl = #{record.kcsl,jdbcType=VARCHAR},
+      commit_people = #{record.commitPeople,jdbcType=VARCHAR},
+      commit_time = #{record.commitTime,jdbcType=TIMESTAMP}
     where id = #{id,jdbcType=VARCHAR}
   </update>
   <update id="updateByExample" parameterType="map" >
@@ -426,7 +476,11 @@
       cldjpd = #{record.cldjpd,jdbcType=VARCHAR},
       hckyxfx = #{record.hckyxfx,jdbcType=VARCHAR},
       fsbw = #{record.fsbw,jdbcType=VARCHAR},
-      hcjcdh = #{record.hcjcdh,jdbcType=VARCHAR}
+      hcjcdh = #{record.hcjcdh,jdbcType=VARCHAR},
+      lypz = #{record.lypz,jdbcType=INTEGER},
+      kcsl = #{record.kcsl,jdbcType=VARCHAR},
+      commit_people = #{record.commitPeople,jdbcType=VARCHAR},
+      commit_time = #{record.commitTime,jdbcType=TIMESTAMP}
     <if test="_parameter != null" >
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -435,14 +489,15 @@
   <insert id="insertBatch" parameterType="java.util.List">
     insert into t_ccdata (id, org_id, v_cc_code,
     i_tdh, i_value, v_update_time,
-    data_source, v_remark, c_image,hcjcdh
+    data_source, v_remark, c_image,hcjcdh,
+    lypz, kcsl, commit_people, commit_time
     )
     values
     <foreach collection="list" item="cc" index="index" separator=",">
       (#{cc.id,jdbcType=VARCHAR}, #{cc.orgId,jdbcType=VARCHAR}, #{cc.vCcCode,jdbcType=VARCHAR},
       #{cc.iTdh,jdbcType=INTEGER}, #{cc.iValue,jdbcType=INTEGER}, #{cc.vUpdateTime,jdbcType=TIMESTAMP},
       #{cc.dataSource,jdbcType=VARCHAR}, #{cc.vRemark,jdbcType=VARCHAR}, #{cc.cImage,jdbcType=LONGVARBINARY},
-      #{cc.hcjcdh,jdbcType=VARCHAR},
+      #{cc.hcjcdh,jdbcType=VARCHAR},#{lypz,jdbcType=INTEGER},#{kcsl,jdbcType=VARCHAR},#{commitPeople,jdbcType=VARCHAR},#{commitTime,jdbcType=TIMESTAMP}
       )
     </foreach>
   </insert>
@@ -484,4 +539,21 @@
       </if>
     </where>
   </select>
+  <select id="getLastJCDH" resultType="string">
+    select hcjcdh from t_ccdata where commit_time is not null order by commit_time desc
+  </select>
+  <select id="getAJBM" parameterType="string" resultType="string">
+    select ajdm from ods_up_hwxxjk_final where id = #{hwCode}
+  </select>
+  <select id="getCheckGrainAttribute" parameterType="integer" resultType="com.chinaitop.depot.storage.model.TCcdata">
+    select
+        sub_type lypz,
+        number_update/1000 kcsl
+    from
+        storage_qualitycheck
+    where
+        org_id = #{orgId}
+        and house_id = #{houseId}
+        and warehouse_id = #{warehouseId}
+  </select>
 </mapper>

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

@@ -3,6 +3,8 @@ package com.chinaitop.depot.storage.model;
 import java.util.Date;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Getter;
+import lombok.Setter;
 
 public class TCcdata {
     private String id;
@@ -58,6 +60,18 @@ public class TCcdata {
      * 害虫检测单号
      */
     private String hcjcdh;
+    // 粮油品种
+    @Getter @Setter
+    private Integer lypz;
+    // 库存数量(吨)
+    @Getter @Setter
+    private String kcsl;
+    // 提交人
+    @Getter @Setter
+    private String commitPeople;
+    // 提交时间
+    @Getter @Setter
+    private String commitTime;
 
     /**
      * 测虫数据id

src/main/java/com/chinaitop/depot/storage/service/InsectPestDetectionService.java

@@ -71,4 +71,6 @@ public interface InsectPestDetectionService {
      * @param insectPests
      */
 	void saveOrUpdate(String insectPests) throws Exception;
+
+    TCcdata getCheckGrainAttribute(Integer orgId, Integer houseId, Integer warehouseId);
 }

src/main/java/com/chinaitop/depot/storage/service/impl/InsectPestDetectionServiceImpl.java

@@ -10,6 +10,7 @@ import java.util.Map;
 
 import javax.annotation.Resource;
 
+import com.chinaitop.depot.utils.OrderNumberUtil;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -233,9 +234,14 @@ public class InsectPestDetectionServiceImpl implements InsectPestDetectionServic
     		tCcdata.setDataSource("1");//数据来源0是自动检测，1是手工录入
             tCcdata.setJchcff("0");
             //害虫检测单号
-            Map<String,Object> map = new HashMap<String, Object>();
+            String jcdhLast = tCcdataMapper.getLastJCDH();
+            // 获取廒间编码
+            String ajbm = tCcdataMapper.getAJBM(tCcdata.getvHwCode());
+            // 廒间编码+检测日期(yyyyMMdd)+4 位顺序号
+            String jcd = OrderNumberUtil.initNum(ajbm, 4, jcdhLast, tCcdata.getvUpdateTime());
+            /*Map<String,Object> map = new HashMap<String, Object>();
             map.put("warehouseId", tCcdata.getvHwCode());
-            String jcd = getJcd(map, ParameterUtil.getDateYMDHMS(tCcdata.getvUpdateTime()));
+            String jcd = getJcd(map, ParameterUtil.getDateYMDHMS(tCcdata.getvUpdateTime()));*/
             tCcdata.setHcjcdh(jcd);
             tCcdata.setUpdatetime(new Date());
     		tCcdataMapper.insert(tCcdata);
@@ -245,4 +251,9 @@ public class InsectPestDetectionServiceImpl implements InsectPestDetectionServic
     	}
 	}
 
+    @Override
+    public TCcdata getCheckGrainAttribute(Integer orgId, Integer houseId, Integer warehouseId) {
+        return tCcdataMapper.getCheckGrainAttribute(orgId, houseId, warehouseId);
+    }
+
 }

src/main/java/com/chinaitop/depot/storage/utils/HTTPUtils.java

@@ -1,6 +1,7 @@
 package com.chinaitop.depot.storage.utils;
 
 
+import lombok.extern.slf4j.Slf4j;
 import org.apache.http.*;
 import org.apache.http.client.HttpClient;
 import org.apache.http.client.entity.UrlEncodedFormEntity;
@@ -14,8 +15,6 @@ import org.apache.http.impl.client.HttpClients;
 import org.apache.http.message.BasicNameValuePair;
 import org.apache.http.protocol.HTTP;
 import org.apache.http.util.EntityUtils;
-import org.apache.log4j.LogManager;
-import org.apache.log4j.Logger;
 
 import java.io.BufferedReader;
 import java.io.IOException;
@@ -28,12 +27,9 @@ import java.util.Map;
 
 //import org.apache.http.entity.mime.MultipartEntityBuilder;
 
+@Slf4j
 public class HTTPUtils {
 
-    private final static Logger logger = LogManager.getLogger(HTTPUtils.class);
-
-
-
     /**
      * get请求
      * @return
@@ -145,7 +141,7 @@ public class HTTPUtils {
                 return jsonString;
             }
             else{
-                logger.error("请求返回:"+state+"("+url+")");
+                log.error("请求返回: {}"+state+"("+url+")");
             }
         }
         finally {

src/main/java/com/chinaitop/depot/utils/OrderNumberUtil.java

@@ -0,0 +1,100 @@
+package com.chinaitop.depot.utils;
+
+import org.apache.commons.lang.StringUtils;
+import org.springframework.util.ObjectUtils;
+
+import java.text.SimpleDateFormat;
+import java.time.LocalDate;
+import java.util.Date;
+
+/**
+ * @author qingsong.han
+ * @description: 生成单号
+ * @create 2024-11-13 19:28
+ */
+public class OrderNumberUtil {
+
+    /**
+     * int 定长拼接-后缀顺序号
+     *
+     * @param length 总长度
+     * @param param  参数
+     * @return 参数前补0
+     */
+    public static String integerToString(int length, int param) {
+        return String.format("%0" + length + "d", param);
+    }
+
+    /**
+     * 中缀
+     *
+     * @return yyyyMMdd
+     */
+    private static String getLocalDate() {
+        String now = LocalDate.now().toString();
+        return now.replaceAll("-", "");
+    }
+
+    /**
+     * @param f 前缀
+     * @return 前缀+中缀+后缀 拼接
+     */
+    public static String frontData(String f, int length, int param, Date date) {
+        String localDate = getLocalDate();
+        if (!ObjectUtils.isEmpty(date)) {
+            localDate = getYMD(date);
+        }
+        return String.format("%s%s%s", f, localDate, integerToString(length, param));
+    }
+
+    /**
+     * 主方法
+     * 调用生成完整规则序号: AJXXSJG + 20240622 + 002(数据库查询完整字符串:AJXXSJG20240622001)
+     * @param f 前缀
+     * @param length 位数必须大于0
+     * @param xh 字符串
+     * @param date 时间
+     * @return 尾数+1的编号
+     */
+    public synchronized static String initNum(String f, int length, String xh, Date date) {
+        // 初始化
+        int num = 1;
+        if (!StringUtils.isEmpty(xh)) {
+            String substring = xh.substring(xh.length() - length);
+            int i = Integer.parseInt(substring);
+            if (i < maxNum(length))
+                num += i;
+        }
+        return frontData(f, length, num, date);
+    }
+
+    /**
+     * 获取int位数的最大值:如6位->999999
+     * @param length int位数
+     * @return int
+     */
+    private static int maxNum(int length) {
+        if (0 < length) {
+            StringBuilder builder = new StringBuilder();
+            for (int i = 0; i < length; i++) {
+                builder.append(9);
+            }
+            return Integer.parseInt(builder.toString());
+        }
+        return 0;
+    }
+
+    // 获取日期格式化
+    public static String getYMD(Date param) {
+        SimpleDateFormat dateTime = new SimpleDateFormat("yyyyMMdd");
+        return dateTime.format(param);
+    }
+
+//    public static void main(String[] args) {
+//        System.out.println(frontData("JH",4, 2));
+//        System.out.println("-->" + maxNum(3));
+//        System.out.println("-->" + initNum("AJXXSJG", 3, "AJXXSJG20240622001"));
+//        System.out.println("-->" + initNum("3191120116103622208D010021", 4, "3191120116103622208D010021202411130001", new Date()));
+//    }
+
+}

src/main/resources/bootstrap.yml

@@ -35,12 +35,12 @@ spring:
   # 数据库配置
   datasource:
     type: com.alibaba.druid.pool.DruidDataSource
-    #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://200.2.68.126:9088/depot:INFORMIXSERVER=gbaseserver;NEWCODESET=GBK,8859-1,819;GL_USEGLU=1;IFX_USE_STRENC=true;characterEncoding=utf8;
+    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: GBase123
+    password: cDbK2S0go8
+    #url: jdbc:gbasedbt-sqli://200.2.68.126: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
 
   # 缓存配置