Merge branch 'dev' of depot-qinghai/depot-storage-qinghai into master

src/main/java/com/chinaitop/depot/product/controller/DataKcglCplkcswDefaultController.java

@@ -23,9 +23,9 @@ import io.swagger.annotations.ApiOperation;
  * shine
  * 成品粮 库存实物
  */
+@RequestMapping(value="/cplkc")
+@Api(tags="成品粮油库存实物")
 @RestController
-@RequestMapping(value = "/cplkc")
-@Api(value= "DataKcglCplkcswDefaultController", description = "成品粮油库存实物")
 public class DataKcglCplkcswDefaultController {
 
     @Resource
@@ -45,9 +45,9 @@ public class DataKcglCplkcswDefaultController {
 
     })
     public PageInfo<DataKcglCplkcswDefault> getList(Integer pageNum, Integer pageSize, 
-    		String houseName, String wareName, String sjjlspmc, Integer orgId){
+    		String houseId, String wareId, String sjjlspmc, Integer orgId){
     	
-        List<DataKcglCplkcswDefault> list = dataKcglCplkcswDefaultService.getlist(pageNum,pageSize,houseName,wareName,sjjlspmc,orgId);
+        List<DataKcglCplkcswDefault> list = dataKcglCplkcswDefaultService.getlist(pageNum,pageSize,houseId,wareId,sjjlspmc,orgId);
         		 
         PageInfo<DataKcglCplkcswDefault> pageInfo = new PageInfo<DataKcglCplkcswDefault>(list);
         return pageInfo;

src/main/java/com/chinaitop/depot/product/mapper/DataKcglCplkcswDefaultMapper.xml

@@ -104,9 +104,9 @@
   </sql>
   
   <sql id="Base_Column_List_Org" >
-    kc.dataId, kc.unitid, kc.zdmc, kc.zdbm, kc.ch, kc.hwh, kc.chmc, kc.hwmc, kc.builder, kc.cjsj, kc.editor, kc.modifyDate, 
+    kc.dataId, kc.unitid, kc.zdmc, kc.zdbm, kc.ch, kc.hwh,kc.builder, kc.cjsj, kc.editor, kc.modifyDate, 
     kc.updateTime, kc.scrq, kc.bzq, kc.xz, kc.deptId, kc.sjjlpzmc, kc.sjjlpzbh, kc.sjjlppmc, kc.sjjlppbh, kc.sjjldjbh, 
-    kc.sjjldjmc, kc.sjjlspmc, kc.sjjlspmcbh, kc.kcsl, kc.scpc, kc.gg, kc.jldw, kc.zje, kc.js, kc.scnf, kc.cd, kc.rcrq
+    kc.sjjlspmc, kc.sjjlspmcbh, kc.kcsl, kc.scpc, kc.gg, kc.jldw, kc.zje, kc.js, kc.scnf, kc.cd, kc.rcrq
   </sql>
   
   <select id="selectByExample" resultMap="BaseResultMap" parameterType="com.chinaitop.depot.product.model.DataKcglCplkcswDefaultExample" >
@@ -114,8 +114,14 @@
     <if test="distinct" >
       distinct
     </if>
-    <include refid="Base_Column_List" />
-    from data_kcgl_cplkcsw_default
+    <include refid="Base_Column_List_Org" />,
+    s.storehouse_name chmc,
+    w.warehouse_name hwmc,
+    e.enumname sjjldjmc
+    from data_kcgl_cplkcsw_default kc
+    left join basic_storehouse s on s.storehouse_id = kc.ch
+    left join basic_warehouse w on w.warehouse_id = kc.hwh
+    left join basic_enum e on e.enumId = kc.sjjldjbh
     <if test="_parameter != null" >
       <include refid="Example_Where_Clause" />
     </if>
@@ -126,9 +132,15 @@
   <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.String" >
     select 
     <include refid="Base_Column_List_Org" />,
-    o.org_name orgName
+    o.org_name orgName,
+    s.storehouse_name chmc,
+    w.warehouse_name hwmc,
+    e.enumname sjjldjmc
     from data_kcgl_cplkcsw_default kc
     left join org_info o on kc.unitid = o.org_id
+    left join basic_storehouse s on s.storehouse_id = kc.ch
+    left join basic_warehouse w on w.warehouse_id = kc.hwh
+    left join basic_enum e on e.enumId = kc.sjjldjbh
     where kc.dataId = #{dataid,jdbcType=VARCHAR}
     
   </select>

src/main/java/com/chinaitop/depot/product/service/DataKcglCplkcswDefaultService.java

@@ -10,7 +10,7 @@ import com.chinaitop.depot.product.model.DataKcglCplkcswDefault;
  */
 public interface DataKcglCplkcswDefaultService {
 
-	List<DataKcglCplkcswDefault> getlist(Integer pageNum, Integer pageSize, String houseName, String wareName,
+	List<DataKcglCplkcswDefault> getlist(Integer pageNum, Integer pageSize, String houseId, String wareId,
 			String sjjlspmc, Integer orgId);
 
 	DataKcglCplkcswDefault getById(String id);

src/main/java/com/chinaitop/depot/product/service/impl/DataKcglCplkcswDefaultServiceImpl.java

@@ -20,17 +20,17 @@ public class DataKcglCplkcswDefaultServiceImpl implements DataKcglCplkcswDefault
 	private DataKcglCplkcswDefaultMapper dataKcglCplkcswDefaultMapper;
 
 	@Override
-	public List<DataKcglCplkcswDefault> getlist(Integer pageNum, Integer pageSize, String houseName, String wareName,
+	public List<DataKcglCplkcswDefault> getlist(Integer pageNum, Integer pageSize, String houseId, String wareId,
 			String sjjlspmc, Integer orgId) {
 		
 		DataKcglCplkcswDefaultExample dataKcglCplkcswDefaultExample = new DataKcglCplkcswDefaultExample();
     	DataKcglCplkcswDefaultExample.Criteria criteria = dataKcglCplkcswDefaultExample.createCriteria();
         
-        if(ParameterUtil.isnotnull(houseName)){
-           criteria.andChmcLike(houseName);
+        if(ParameterUtil.isnotnull(houseId)){
+           criteria.andChEqualTo(houseId);
         }
-        if(ParameterUtil.isnotnull(wareName)){
-            criteria.andHwmcLike(wareName);
+        if(ParameterUtil.isnotnull(wareId)){
+            criteria.andHwhEqualTo(wareId);
          }
         if(ParameterUtil.isnotnull(sjjlspmc)){
             criteria.andSjjlspmcLike(sjjlspmc);

src/main/java/com/chinaitop/depot/warningAndAlarm/controller/TimedTaskController.java

@@ -22,7 +22,7 @@ public class TimedTaskController {
 	@Resource
 	private TimedTaskService timeTaskService;
 
-	@Scheduled(cron = "0 0 1 * * ?")
+//	@Scheduled(cron = "0 0 1 * * ?")
 	@RequestMapping(value="/checkYlwl", method = RequestMethod.GET)
 	@ApiOperation(value="检测应轮未轮报警数据", notes = "定时任务检测,每天凌晨1点执行")
 	public void checkYlwl() {
@@ -33,7 +33,7 @@ public class TimedTaskController {
 		}
 	}
 
-	@Scheduled(cron = "0 30 1 * * ?")
+//	@Scheduled(cron = "0 30 1 * * ?")
 	@RequestMapping(value="/checkLhyj", method = RequestMethod.GET)
 	@ApiOperation(value="检测轮换预警数据", notes = "定时任务检测,每天凌晨1:30点执行")
 	public void checkLhyj() {
@@ -44,7 +44,7 @@ public class TimedTaskController {
 		}
 	}
 
-	@Scheduled(cron = "0 0 2 * * ?")
+//	@Scheduled(cron = "0 0 2 * * ?")
 	@RequestMapping(value="/checkJkqyj", method = RequestMethod.GET)
 	@ApiOperation(value="检测架空期预警数据", notes = "定时任务检测,每天凌晨2点执行")
 	public void checkJkqyj() {

src/main/java/com/chinaitop/depot/warningAndAlarm/controller/YjBjController.java

@@ -67,15 +67,16 @@ public class YjBjController {
         @ApiImplicitParam(name = "orgId", value = "库ID", paramType = "query"),
         @ApiImplicitParam(name = "ch", value = "仓房ID", paramType = "query"),
         @ApiImplicitParam(name = "hwh", value = "货位ID", paramType = "query"),
-        @ApiImplicitParam(name = "lspz", value = "粮食品种ID", paramType = "query")
+        @ApiImplicitParam(name = "lspz", value = "粮食品种ID", paramType = "query"),
+        @ApiImplicitParam(name = "rksj", value = "入库时间", paramType = "query")
 	})
-	public ResponseEntity<PageInfo<StorageRotationWarning>> getYlwlPageInfoList(Integer pageNum, Integer pageSize, Integer orgId, Integer ch, Integer hwh, Integer lspz) {
+	public ResponseEntity<PageInfo<StorageRotationWarning>> getYlwlPageInfoList(Integer pageNum, Integer pageSize, Integer orgId, Integer ch, Integer hwh, Integer lspz,String rksj) {
 		PageInfo<StorageRotationWarning> pageInfo = null;
 		try {
 			if (pageNum != null && pageSize != null) {
 	            PageHelper.startPage(pageNum, pageSize);
 	        }
-			List<StorageRotationWarning> list = yjbjService.queryYlwlList(orgId, ch, hwh, lspz);
+			List<StorageRotationWarning> list = yjbjService.queryYlwlList(orgId, ch, hwh, lspz, rksj);
 			pageInfo = new PageInfo<>(list);
 		} catch (Exception e) {
 			log.error(e.getMessage(), e);

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

@@ -28,7 +28,7 @@ public interface YjbjService {
 	 * @return
 	 * @throws Exception
 	 */
-	public List<StorageRotationWarning> queryYlwlList(Integer orgId, Integer ch, Integer hwh, Integer lspz) throws Exception;
+	public List<StorageRotationWarning> queryYlwlList(Integer orgId, Integer ch, Integer hwh, Integer lspz,String rksj) throws Exception;
 
 	/**
 	 * 更新轮换预警报警数据的处理结果信息

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

@@ -57,7 +57,7 @@ public class YjbjServiceImpl implements YjbjService {
 	}
 
 	@Override
-	public List<StorageRotationWarning> queryYlwlList(Integer orgId, Integer ch, Integer hwh, Integer lspz)
+	public List<StorageRotationWarning> queryYlwlList(Integer orgId, Integer ch, Integer hwh, Integer lspz,String rksj)
 			throws Exception {
 
 		StorageRotationWarningExample example = new StorageRotationWarningExample();
@@ -75,6 +75,9 @@ public class YjbjServiceImpl implements YjbjService {
 		if (null != lspz) {
 			criteria.andLspzEqualTo(lspz);  //粮食品种ID
 		}
+		if (null != rksj) {
+			criteria.andZhycrqLike(rksj);
+		}
 
 		criteria.andBjlxEqualTo(StatusUtils.LHYJBJ_TYPE_1); //查询应轮未轮报警的数据