转圈粮预警

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

@@ -20,6 +20,7 @@ import com.chinaitop.depot.yjbj.model.StorageAlarmRecordWithBLOBs;
 import com.chinaitop.depot.yjbj.model.Thprkyj;
 import com.chinaitop.depot.yjbj.model.Zkycbj;
 import com.chinaitop.depot.yjbj.model.Zlbj;
+import com.chinaitop.depot.yjbj.model.Zqlyj;
 import com.chinaitop.depot.yjbj.service.StorageAlarmRecordService;
 import com.chinaitop.depot.yjbj.service.YjbjService;
 import com.github.pagehelper.PageHelper;
@@ -250,6 +251,30 @@ public class YjbjController {
 		}
 	}
 
+	@RequestMapping(value="/getZqlyjPageList", 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 = "bjrq", value = "报警日期", paramType = "query"),
+        @ApiImplicitParam(name = "orgId", value = "库ID", required=true, paramType = "query")
+	})
+	public ResponseEntity getZqlyjPageList(Integer pageNum, Integer pageSize, Integer orgId, String bjrq) {
+
+		PageInfo<Zqlyj> pageInfo = null;
+		try {
+			if (pageNum != null && pageSize != null) {
+	            PageHelper.startPage(pageNum, pageSize);
+	        }
+			List<Zqlyj> list = yjbjService.selectZqlyj(orgId, bjrq);
+			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

@@ -1,6 +1,7 @@
 package com.chinaitop.depot.yjbj.mapper;
 
 import java.util.List;
+import java.util.Map;
 
 import org.apache.ibatis.annotations.Param;
 
@@ -13,6 +14,7 @@ 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;
+import com.chinaitop.depot.yjbj.model.Zqlyj;
 
 public interface YjbjMapper {
 
@@ -78,4 +80,11 @@ public interface YjbjMapper {
 	 * @return
 	 */
 	List<Dbtyj> selectDbtyj(@Param("obj") Dbtyj obj);
+
+	/**
+	 * 转圈粮预警查询
+	 * @param map
+	 * @return
+	 */
+	List<Zqlyj> selectZqlyj(@Param("obj") Map<String, Object> map);
 }

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

@@ -139,4 +139,25 @@
     </where>
     order by bjsj desc
   </select>
+  <!-- 转圈粮预警数据查询 -->
+  <select id="selectZqlyj" resultType="com.chinaitop.depot.yjbj.model.Zqlyj" parameterType="map">
+    select
+        id,
+		dispose_time as rmsj,
+		detail as bjxx,
+		1 as sfrmdj,
+		disposer as djr,
+		org_id as orgId,
+		create_time as bjsj
+	from storage_pre_violation
+    <where>
+      <if test="obj.cfmc != null">
+        and create_time between #{obj.startTime,jdbcType=VARCHAR} and #{obj.endTime,jdbcType=VARCHAR}
+      </if>
+      <if test="obj.orgId != null">
+        and org_id = #{obj.orgId,jdbcType=INTEGER}
+      </if>
+    </where>
+    order by create_time desc
+  </select>
 </mapper>

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

@@ -0,0 +1,28 @@
+package com.chinaitop.depot.yjbj.model;
+
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import lombok.Data;
+
+/**
+ * 转圈粮预警
+ * @author zhugong
+ *
+ */
+@Data
+public class Zqlyj {
+
+	private Integer id;//主键ID
+	private Integer orgId;//库ID
+	@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+	private Date bjsj;//报警时间
+	private String rkcl;//入库车辆
+	private String pzmc;//品种名称
+	private String bjxx;//报警信息
+	private String sfrmdj;//是否入门登记
+	private String djr;//登记人
+	@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+	private Date rmsj;//入门时间
+}

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

@@ -11,6 +11,7 @@ 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;
+import com.chinaitop.depot.yjbj.model.Zqlyj;
 
 public interface YjbjService {
 
@@ -94,4 +95,13 @@ public interface YjbjService {
 	 * @throws Exception
 	 */
 	List<Dbtyj> selectDbtyj(Integer orgId, String cfmc) throws Exception;
+
+	/**
+	 * 转圈粮预警
+	 * @param orgId 库ID
+	 * @param bjrq 报警日期
+	 * @return
+	 * @throws Exception
+	 */
+	List<Zqlyj> selectZqlyj(Integer orgId, String bjrq) throws Exception;
 }

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

@@ -1,12 +1,15 @@
 package com.chinaitop.depot.yjbj.service.impl;
 
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 import javax.annotation.Resource;
 
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 
+import com.chinaitop.depot.utils.DateUtil;
 import com.chinaitop.depot.yjbj.mapper.YjbjMapper;
 import com.chinaitop.depot.yjbj.model.Chbj;
 import com.chinaitop.depot.yjbj.model.Dbtyj;
@@ -17,6 +20,7 @@ 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;
+import com.chinaitop.depot.yjbj.model.Zqlyj;
 import com.chinaitop.depot.yjbj.service.YjbjService;
 
 @Service
@@ -115,4 +119,40 @@ public class YjbjServiceImpl implements YjbjService {
 		return yjbjMapper.selectDbtyj(obj);
 	}
 
+	@Override
+	public List<Zqlyj> selectZqlyj(Integer orgId, String bjrq) throws Exception {
+		Map<String, Object> map = new HashMap<>();
+		map.put("orgId", orgId);
+		if (StringUtils.isNotBlank(bjrq)) {
+            map.put("startTime", String.format("%s%s", bjrq, DateUtil.startTime));
+            map.put("endTime", String.format("%s%s", bjrq, DateUtil.endTime));
+        }
+		List<Zqlyj> list = yjbjMapper.selectZqlyj(map);
+		for (Zqlyj grainRotationAlarmVO : list) {
+			if(!StringUtils.isEmpty(grainRotationAlarmVO.getBjxx())){
+				String rkcl = "";
+				//String sczykdmc = "";
+				String pzmc = "";
+				String yjxx = "";
+				String originYjxx = grainRotationAlarmVO.getBjxx();
+				if (originYjxx.startsWith("车牌号")) {
+					rkcl = originYjxx.substring(originYjxx.indexOf("车牌号")+3,originYjxx.indexOf("车辆"));
+					//sczykdmc = originYjxx.substring(originYjxx.indexOf("“")+1,originYjxx.lastIndexOf("”"));
+					pzmc = originYjxx.substring(originYjxx.indexOf("粮食品种：")+5,originYjxx.indexOf("、"));
+					yjxx = "上一次入库化验不合格再入库的同号牌同品种车辆";
+				} else if (originYjxx.startsWith("注意：")) {
+					rkcl = originYjxx.substring(originYjxx.indexOf("【")+1,originYjxx.indexOf("】"));
+					//sczykdmc = originYjxx.substring(originYjxx.indexOf("“")+1,originYjxx.lastIndexOf("”"));
+					pzmc = originYjxx.substring(originYjxx.indexOf("粮食品种：")+5,originYjxx.indexOf("、"));
+					yjxx = "3天内上一次为出库作业同号牌同品种的车辆";
+				}
+				grainRotationAlarmVO.setRkcl(rkcl);
+				grainRotationAlarmVO.setPzmc(pzmc);
+				grainRotationAlarmVO.setBjxx(yjxx);
+			}
+
+		}
+		return list;
+	}
+
 }