空进空出预警

src/main/java/com/chinaitop/depot/yjbj/controller/YjbjController.java

@@ -14,6 +14,7 @@ import com.chinaitop.depot.yjbj.model.Chbj;
 import com.chinaitop.depot.yjbj.model.Hybhgclzrkyj;
 import com.chinaitop.depot.yjbj.model.Jksbgz;
 import com.chinaitop.depot.yjbj.model.Jybgcqyj;
+import com.chinaitop.depot.yjbj.model.Kjkcyj;
 import com.chinaitop.depot.yjbj.model.StorageAlarmRecordWithBLOBs;
 import com.chinaitop.depot.yjbj.model.Thprkyj;
 import com.chinaitop.depot.yjbj.model.Zkycbj;
@@ -178,7 +179,7 @@ public class YjbjController {
 			return ResponseEntity.failed("查询失败:" + e.getMessage());
 		}
 	}
-	
+
 	@RequestMapping(value="/getZlbjPageList", produces = MediaType.APPLICATION_JSON_VALUE, method = RequestMethod.GET)
 	@ApiOperation(value="查询质量报警列表", notes = "支持分页")
 	@ApiImplicitParams({
@@ -202,6 +203,29 @@ public class YjbjController {
 		}
 	}
 
+	@RequestMapping(value="/getKjkcyjPageList", produces = MediaType.APPLICATION_JSON_VALUE, method = RequestMethod.GET)
+	@ApiOperation(value="查询空进空出预警列表", notes = "支持分页")
+	@ApiImplicitParams({
+		@ApiImplicitParam(name = "pageNum", value = "页码", paramType = "query"),
+        @ApiImplicitParam(name = "pageSize", value = "每页条数", paramType = "query"),
+        @ApiImplicitParam(name = "rkcl", value = "入库车辆", paramType = "query"),
+        @ApiImplicitParam(name = "orgId", value = "库ID", required=true, paramType = "query")
+	})
+	public ResponseEntity getKjkcyjPageList(Integer pageNum, Integer pageSize, String rkcl, Integer orgId) {
+		PageInfo<Kjkcyj> pageInfo = null;
+		try {
+			if (pageNum != null && pageSize != null) {
+	            PageHelper.startPage(pageNum, pageSize);
+	        }
+			List<Kjkcyj> list = yjbjService.selectKjkcyj(orgId, rkcl);
+			pageInfo = new PageInfo<>(list);
+			return ResponseEntity.ok(pageInfo);
+		} catch (Exception e) {
+			log.error(e.getMessage(), e);
+			return ResponseEntity.failed("查询失败:" + e.getMessage());
+		}
+	}
+
 	@RequestMapping(value="/getCljl", produces = MediaType.APPLICATION_JSON_VALUE, method = RequestMethod.GET)
 	@ApiOperation(value="查询处理记录", notes = "")
 	@ApiImplicitParams({

src/main/java/com/chinaitop/depot/yjbj/mapper/YjbjMapper.java

@@ -8,6 +8,7 @@ import com.chinaitop.depot.yjbj.model.Chbj;
 import com.chinaitop.depot.yjbj.model.Hybhgclzrkyj;
 import com.chinaitop.depot.yjbj.model.Jksbgz;
 import com.chinaitop.depot.yjbj.model.Jybgcqyj;
+import com.chinaitop.depot.yjbj.model.Kjkcyj;
 import com.chinaitop.depot.yjbj.model.Thprkyj;
 import com.chinaitop.depot.yjbj.model.Zkycbj;
 import com.chinaitop.depot.yjbj.model.Zlbj;
@@ -62,4 +63,11 @@ public interface YjbjMapper {
 	 * @return
 	 */
 	List<Zlbj> selectZlbj(@Param("obj") Zlbj obj);
+
+	/**
+	 * 空进空出预警数据查询
+	 * @param obj
+	 * @return
+	 */
+	List<Kjkcyj> selectKjkcyj(Kjkcyj obj);
 }

src/main/java/com/chinaitop/depot/yjbj/mapper/YjbjMapper.xml

@@ -109,4 +109,19 @@
     </where>
     order by bjsj desc
   </select>
+  <!-- 质量报警数据查询 -->
+  <select id="selectKjkcyj" resultType="com.chinaitop.depot.yjbj.model.Kjkcyj" parameterType="map">
+    select 
+  		id,rkcl,first_czzl firstCzzl, second_czzl secondCzzl, bjsj, org_id orgId
+	from storage_alarm_empty_in_out 
+    <where>
+      <if test="obj.rkcl != null">
+        and rkcl like #{obj.rkcl,jdbcType=VARCHAR}
+      </if>
+      <if test="obj.orgId != null">
+        and org_id = #{obj.orgId,jdbcType=INTEGER}
+      </if>
+    </where>
+    order by bjsj desc
+  </select>
 </mapper>

src/main/java/com/chinaitop/depot/yjbj/model/Kjkcyj.java

@@ -0,0 +1,24 @@
+package com.chinaitop.depot.yjbj.model;
+
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import lombok.Data;
+
+/**
+ * 空进空出预警
+ * @author fxw
+ *
+ */
+@Data
+public class Kjkcyj {
+
+	private String id;//主键ID
+	private String rkcl;//入库车辆
+	private String firstCzzl;//第一车称重重量
+	private String secondCzzl;//第二次称重重量
+	@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+	private Date bjsj;//报警时间
+	private Integer orgId;//库ID
+}

src/main/java/com/chinaitop/depot/yjbj/service/YjbjService.java

@@ -6,6 +6,7 @@ import com.chinaitop.depot.yjbj.model.Chbj;
 import com.chinaitop.depot.yjbj.model.Hybhgclzrkyj;
 import com.chinaitop.depot.yjbj.model.Jksbgz;
 import com.chinaitop.depot.yjbj.model.Jybgcqyj;
+import com.chinaitop.depot.yjbj.model.Kjkcyj;
 import com.chinaitop.depot.yjbj.model.Thprkyj;
 import com.chinaitop.depot.yjbj.model.Zkycbj;
 import com.chinaitop.depot.yjbj.model.Zlbj;
@@ -74,4 +75,13 @@ public interface YjbjService {
 	 * @throws Exception
 	 */
 	List<Zlbj> selectZlbj(Integer orgId, String cfmc) throws Exception;
+
+	/**
+	 * 空进空出预警数据查询
+	 * @param orgId 库ID
+	 * @param rkcl 入库车辆
+	 * @return
+	 * @throws Exception
+	 */
+	List<Kjkcyj> selectKjkcyj(Integer orgId, String rkcl) throws Exception;
 }

src/main/java/com/chinaitop/depot/yjbj/service/impl/YjbjServiceImpl.java

@@ -12,6 +12,7 @@ import com.chinaitop.depot.yjbj.model.Chbj;
 import com.chinaitop.depot.yjbj.model.Hybhgclzrkyj;
 import com.chinaitop.depot.yjbj.model.Jksbgz;
 import com.chinaitop.depot.yjbj.model.Jybgcqyj;
+import com.chinaitop.depot.yjbj.model.Kjkcyj;
 import com.chinaitop.depot.yjbj.model.Thprkyj;
 import com.chinaitop.depot.yjbj.model.Zkycbj;
 import com.chinaitop.depot.yjbj.model.Zlbj;
@@ -93,4 +94,14 @@ public class YjbjServiceImpl implements YjbjService {
 		return yjbjMapper.selectZlbj(obj);
 	}
 
+	@Override
+	public List<Kjkcyj> selectKjkcyj(Integer orgId, String rkcl) throws Exception {
+		Kjkcyj obj = new Kjkcyj();
+		obj.setOrgId(orgId);
+		if (StringUtils.isNotBlank(rkcl)) {
+			obj.setRkcl("%"+rkcl+"%");
+		}
+		return yjbjMapper.selectKjkcyj(obj);
+	}
+
 }