测虫接口添加检查单号

src/main/java/com/chinaitop/depot/intelligent/grainsituation/mapper/TCcvalueMapper.java

@@ -29,5 +29,7 @@ public interface TCcvalueMapper {
     List<Map<String,Object>> getByCfCodes(Map<String, Object> mapDate);
 
     TCcvalue getOneByCfCode(Map<String, Object> map);
+    
+    List<Map<String,Object>> getJcd(Map<String, Object> map);
 
 }

src/main/java/com/chinaitop/depot/intelligent/grainsituation/mapper/TCcvalueMapper.xml

@@ -237,13 +237,13 @@
     insert into t_ccvalue (id, org_id, v_cc_code,
     z_zd_code, v_cf_code, v_max,
     v_min, v_avg, v_update_time,
-    data_source)
+    data_source,hcjcdh)
     values
     <foreach collection="list" item="cc" index="index" separator=",">
       (#{cc.id,jdbcType=VARCHAR}, #{cc.orgId,jdbcType=VARCHAR}, #{cc.vCcCode,jdbcType=VARCHAR},
       #{cc.zZdCode,jdbcType=VARCHAR}, #{cc.vCfCode,jdbcType=VARCHAR}, #{cc.vMax,jdbcType=INTEGER},
       #{cc.vMin,jdbcType=INTEGER}, #{cc.vAvg,jdbcType=DECIMAL}, #{cc.vUpdateTime,jdbcType=TIMESTAMP},
-      #{cc.dataSource,jdbcType=VARCHAR})
+      #{cc.dataSource,jdbcType=VARCHAR}), #{cc.hcjcdh,jdbcType=VARCHAR})
     </foreach>
   </insert>
 
@@ -308,4 +308,17 @@
     GROUP BY v_update_time
     ORDER BY v_update_time DESC LIMIT 0,1
   </select>
+  
+  <select id="getJcd" parameterType="java.util.Map" resultType="java.util.Map">
+  	SELECT
+		concat(credit_code,LPAD(org_id, 3, 0),LPAD(#{vcfcode}, 4, 0),DATE_FORMAT(STR_TO_DATE(#{updateTime},'%Y-%m-%d %H:%i:%s'),'%Y%m%d%H%i'),'00000') jcd
+	FROM
+		org_info
+    <where>
+      <if test="orgId != null">
+        org_id = #{orgId}
+      </if>
+    </where>
+  </select>
+  
 </mapper>

src/main/java/com/chinaitop/depot/intelligent/grainsituation/model/TCcvalue.java

@@ -23,6 +23,8 @@ public class TCcvalue {
     private Date vUpdateTime;
 
     private String dataSource;
+    
+    private String hcjcdh;
 
     /**
      * 测虫设备code
@@ -183,4 +185,13 @@ public class TCcvalue {
     public void setDataSource(String dataSource) {
         this.dataSource = dataSource == null ? null : dataSource.trim();
     }
+
+	public String getHcjcdh() {
+		return hcjcdh;
+	}
+
+	public void setHcjcdh(String hcjcdh) {
+		this.hcjcdh = hcjcdh == null ? null : hcjcdh.trim();
+	}
+    
 }

src/main/java/com/chinaitop/depot/intelligent/grainsituation/service/InsectPestDetectionService.java

@@ -52,4 +52,6 @@ public interface InsectPestDetectionService {
     List<TCcdata> getByCodeAndTimes(List<String> cDcsCodes, List<Date> cTimes, List<Integer> tdhs);
 
     TCcvalue getOneByCfCode(String orgId, String vCfCode);
+    
+    List<Map<String, Object>> getJcd(Map<String, Object> map);
 }

src/main/java/com/chinaitop/depot/intelligent/grainsituation/service/impl/InsectPestDetectionServiceImpl.java

@@ -170,4 +170,9 @@ public class InsectPestDetectionServiceImpl implements InsectPestDetectionServic
         }
         return null;
     }
+
+	@Override
+	public List<Map<String, Object>> getJcd(Map<String, Object> map) {
+		return tCcvalueMapper.getJcd(map);
+	}
 }

src/main/java/com/chinaitop/depot/intelligent/pushs/service/impl/InsectPushsServiceImpl.java

@@ -14,6 +14,8 @@ import com.chinaitop.depot.intelligent.utils.*;
 import com.google.common.collect.Lists;
 import com.unissoft.model.ResponseEntity;
 import com.unissoft.model.TypeEnum;
+
+import org.apache.commons.lang.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -108,6 +110,7 @@ public class InsectPushsServiceImpl implements InsectPushsService {
                                 }
                             }
                         });
+                        
                         cv.setId(uuidUtils.getCodeId(orgId, "t_ccvalue"));
                         cv.setOrgId(orgId);
                         cv.setDataSource(dataSource2);
@@ -120,6 +123,15 @@ public class InsectPushsServiceImpl implements InsectPushsService {
                         cv.setvAvg(avg);
                         Date date = values.stream().map(TCcdata::getvUpdateTime).distinct().collect(Collectors.toList()).get(0);
                         cv.setvUpdateTime(date);
+                        
+                        Map<String,Object> map = new HashMap<String, Object>();
+                        map.put("orgId", orgId);
+                        map.put("vcfcode", vcfcode);
+                        map.put("updateTime", date);
+                        List<Map<String,Object>> jcdList = insectPestDetectionService.getJcd(map);
+                        String jcd = ObjectUtils.toString(jcdList.get(0).get("jcd"));
+                        cv.setHcjcdh(jcd);
+                        
                         tCcvalues.add(cv);
                     }
                     if (tCcdatas.size() > 0) {