储存超限报警

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

@@ -10,6 +10,7 @@ import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 
 import com.chinaitop.depot.unissoft.model.ResponseEntity;
+import com.chinaitop.depot.yjbj.model.Ccgc;
 import com.chinaitop.depot.yjbj.model.Chbj;
 import com.chinaitop.depot.yjbj.model.Dbtyj;
 import com.chinaitop.depot.yjbj.model.Hybhgclzrkyj;
@@ -17,6 +18,7 @@ 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.Kkyj;
+import com.chinaitop.depot.yjbj.model.Rkzygc;
 import com.chinaitop.depot.yjbj.model.StorageAlarmRecordWithBLOBs;
 import com.chinaitop.depot.yjbj.model.Thprkyj;
 import com.chinaitop.depot.yjbj.model.Zkycbj;
@@ -300,6 +302,54 @@ public class YjbjController {
 		}
 	}
 
+	@RequestMapping(value="/getRkzygcPageList", 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 getRkzygcPageList(Integer pageNum, Integer pageSize, Integer orgId, String rkcl) {
+
+		PageInfo<Rkzygc> pageInfo = null;
+		try {
+			if (pageNum != null && pageSize != null) {
+	            PageHelper.startPage(pageNum, pageSize);
+	        }
+			List<Rkzygc> list = yjbjService.selectRkzygc(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="/getCcgcPageList", 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 = "cfmc", value = "仓房名称", paramType = "query"),
+        @ApiImplicitParam(name = "orgId", value = "库ID", required=true, paramType = "query")
+	})
+	public ResponseEntity getCcgcPageList(Integer pageNum, Integer pageSize, Integer orgId, String cfmc) {
+
+		PageInfo<Ccgc> pageInfo = null;
+		try {
+			if (pageNum != null && pageSize != null) {
+	            PageHelper.startPage(pageNum, pageSize);
+	        }
+			List<Ccgc> list = yjbjService.selectCcgc(orgId, cfmc);
+			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

@@ -5,6 +5,7 @@ import java.util.Map;
 
 import org.apache.ibatis.annotations.Param;
 
+import com.chinaitop.depot.yjbj.model.Ccgc;
 import com.chinaitop.depot.yjbj.model.Chbj;
 import com.chinaitop.depot.yjbj.model.Dbtyj;
 import com.chinaitop.depot.yjbj.model.Hybhgclzrkyj;
@@ -12,6 +13,7 @@ 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.Kkyj;
+import com.chinaitop.depot.yjbj.model.Rkzygc;
 import com.chinaitop.depot.yjbj.model.Thprkyj;
 import com.chinaitop.depot.yjbj.model.Zkycbj;
 import com.chinaitop.depot.yjbj.model.Zlbj;
@@ -95,4 +97,18 @@ public interface YjbjMapper {
 	 * @return
 	 */
 	List<Kkyj> selectKkyj(@Param("obj") Map<String, Object> map);
+
+	/**
+	 * 入库作业过程查询
+	 * @param obj
+	 * @return
+	 */
+	List<Rkzygc> selectRkzygc(@Param("obj") Rkzygc obj);
+	
+	/**
+	 * 存储过程查询
+	 * @param obj
+	 * @return
+	 */
+	List<Ccgc> selectCcgc(@Param("obj") Ccgc obj);
 }

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

@@ -176,4 +176,33 @@
     </if>
     order by bj.bjsj desc
   </select>
+  <!-- 入库作业过程数据查询 -->
+  <select id="selectRkzygc" resultType="com.chinaitop.depot.yjbj.model.Rkzygc" parameterType="map">
+    select 
+		id,org_id orgId,rkcl,cfmc,lyxz,pzmc,scnf,hdcr,kcsl,bjnr,bjsj
+	from kj_inventory_alarm
+    where 1=1 
+    <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>
+    order by bjsj desc
+  </select>
+  <!-- 存储过程数据查询 -->
+  <select id="selectCcgc" resultType="com.chinaitop.depot.yjbj.model.Ccgc" parameterType="map">
+    select 
+    	a.id,o.org_id orgId,a.cfmc,a.lyxz,a.pzmx,a.scnf,a.hdcr,a.kcsl,a.bjsj,a.shzt
+	from depot:inventory_alarm a
+	left join depot:org_info o on o.kqbm=a.kqbm
+    where 1=1 
+    <if test="obj.cfmc != null">
+      and a.cfmc like #{obj.cfmc,jdbcType=VARCHAR}
+    </if>
+    <if test="obj.orgId != null">
+      and o.org_id = #{obj.orgId,jdbcType=INTEGER}
+    </if>
+    order by a.bjsj desc
+  </select>
 </mapper>

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

@@ -0,0 +1,29 @@
+package com.chinaitop.depot.yjbj.model;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import lombok.Data;
+
+/**
+ * 存储过程
+ * @author zhugong
+ *
+ */
+@Data
+public class Ccgc {
+
+	private String id;//主键ID
+	private Integer orgId;//库ID
+	private String cfmc;//仓房名称
+	private String lyxz;//粮油性质
+	private String pzmx;//品种
+	private String scnf;//生产年份
+	private BigDecimal hdcr;//核定仓容
+	private BigDecimal kcsl;//库存数量
+	@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+	private Date bjsj;//报警时间
+	private String shzt;//状态
+}

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

@@ -0,0 +1,29 @@
+package com.chinaitop.depot.yjbj.model;
+
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import lombok.Data;
+
+/**
+ * 入库作业过程
+ * @author zhugong
+ *
+ */
+@Data
+public class Rkzygc {
+
+	private String id;//主键ID
+	private Integer orgId;//库ID
+	private String rkcl;//入库车辆
+	private String cfmc;//仓房名称
+	private String lyxz;//粮油性质
+	private String pzmc;//品种
+	private String scnf;//生产年份
+	private String hdcr;//核定仓容
+	private String kcsl;//库存数量
+	private String bjnr;//报警内容
+	@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+	private Date bjsj;//报警时间
+}

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

@@ -2,6 +2,7 @@ package com.chinaitop.depot.yjbj.service;
 
 import java.util.List;
 
+import com.chinaitop.depot.yjbj.model.Ccgc;
 import com.chinaitop.depot.yjbj.model.Chbj;
 import com.chinaitop.depot.yjbj.model.Dbtyj;
 import com.chinaitop.depot.yjbj.model.Hybhgclzrkyj;
@@ -9,6 +10,7 @@ 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.Kkyj;
+import com.chinaitop.depot.yjbj.model.Rkzygc;
 import com.chinaitop.depot.yjbj.model.Thprkyj;
 import com.chinaitop.depot.yjbj.model.Zkycbj;
 import com.chinaitop.depot.yjbj.model.Zlbj;
@@ -114,4 +116,20 @@ public interface YjbjService {
 	 * @throws Exception
 	 */
 	List<Kkyj> selectKkyj(Integer orgId, String bjsj) throws Exception;
+
+	/**
+	 * 入库作业过程
+	 * @param orgId 库ID
+	 * @param rkcl 入库车辆
+	 * @return
+	 */
+	List<Rkzygc> selectRkzygc(Integer orgId, String rkcl) throws Exception;
+
+	/**
+	 * 存储过程
+	 * @param orgId 库ID
+	 * @param cfmc 入库车辆
+	 * @return
+	 */
+	List<Ccgc> selectCcgc(Integer orgId, String cfmc) throws Exception;
 }

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

@@ -11,6 +11,7 @@ import org.springframework.stereotype.Service;
 
 import com.chinaitop.depot.utils.DateUtil;
 import com.chinaitop.depot.yjbj.mapper.YjbjMapper;
+import com.chinaitop.depot.yjbj.model.Ccgc;
 import com.chinaitop.depot.yjbj.model.Chbj;
 import com.chinaitop.depot.yjbj.model.Dbtyj;
 import com.chinaitop.depot.yjbj.model.Hybhgclzrkyj;
@@ -18,6 +19,7 @@ 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.Kkyj;
+import com.chinaitop.depot.yjbj.model.Rkzygc;
 import com.chinaitop.depot.yjbj.model.Thprkyj;
 import com.chinaitop.depot.yjbj.model.Zkycbj;
 import com.chinaitop.depot.yjbj.model.Zlbj;
@@ -168,4 +170,24 @@ public class YjbjServiceImpl implements YjbjService {
 		return yjbjMapper.selectKkyj(map);
 	}
 
+	@Override
+	public List<Rkzygc> selectRkzygc(Integer orgId, String rkcl) throws Exception {
+		Rkzygc obj = new Rkzygc();
+		obj.setOrgId(orgId);
+		if (StringUtils.isNotBlank(rkcl)) {
+			obj.setRkcl("%"+rkcl+"%");
+		}
+		return yjbjMapper.selectRkzygc(obj);
+	}
+
+	@Override
+	public List<Ccgc> selectCcgc(Integer orgId, String cfmc) throws Exception {
+		Ccgc obj = new Ccgc();
+		obj.setOrgId(orgId);
+		if (StringUtils.isNotBlank(cfmc)) {
+			obj.setCfmc("%"+cfmc+"%");
+		}
+		return yjbjMapper.selectCcgc(obj);
+	}
+
 }