From 04aeda48634ff70d08d9fb7fac4d60d4c96b6992 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期一, 23 九月 2024 08:15:24 +0800
Subject: [PATCH] 原片仓储代码功能编写：基础逻辑、代码规范、添加/修改字段，移除无用的方法，新增表连接查询mapper
---
hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglassdetails/entity/RawGlassStorageDetails.java | 13 +
hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/job/push.java | 9 -
hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglasstask/entity/request/RawGlassTaskRequest.java | 20 +-
hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglassstation/mapper/RawGlassStorageStationMapper.java | 6
hangzhoumesParent/moduleService/GlassStorageModule/src/main/resources/mapper/RawGlassStorageStationMapper.xml | 31 ++++
hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglassdetails/service/impl/RawGlassStorageDetailsServiceImpl.java | 26 ++-
hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglassstation/service/RawGlassStorageStationService.java | 5
hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglasstask/entity/RawGlassStorageTask.java | 13 -
hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglassdetails/service/RawGlassStorageDetailsService.java | 31 +++
hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglassdetails/entity/request/RawGlassRequest.java | 42 ++++++
/dev/null | 5
hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglasstask/service/RawGlassStorageTaskService.java | 21 +-
hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglassdetails/controller/RawGlassStorageDetailsController.java | 16 -
hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglassstation/service/impl/RawGlassStorageStationServiceImpl.java | 8
hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglasstask/service/impl/RawGlassRawGlassStorageTaskServiceImpl.java | 96 ++-----------
hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglasstask/controller/RawGlassStorageTaskController.java | 19 +-
16 files changed, 203 insertions(+), 158 deletions(-)
diff --git a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/job/push.java b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/job/push.java
index df39184..d3970d5 100644
--- a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/job/push.java
+++ b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/job/push.java
@@ -7,11 +7,9 @@
import com.mes.rawglassstation.service.RawGlassStorageStationService;
import com.mes.rawglasstask.entity.RawGlassStorageTask;
import com.mes.rawglasstask.service.RawGlassStorageTaskService;
-import com.mes.shelfrack.service.ShelfRackService;
-import com.mes.storagetask.service.StorageTaskService;
import com.mes.tools.WebSocketServer;
-import org.springframework.beans.factory.annotation.Autowired;
import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
@@ -23,13 +21,10 @@
public class push {
@Autowired
- private StorageTaskService storageTaskService;
- @Autowired
- private ShelfRackService shelfRackService;
- @Autowired
private RawGlassStorageDetailsService rawGlassStorageDetailsService;
@Autowired
private RawGlassStorageStationService rawGlassStorageStationService;
+
@Autowired
private RawGlassStorageTaskService rawGlassStorageTaskService;
diff --git a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglassdetails/controller/RawGlassStorageDetailsController.java b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglassdetails/controller/RawGlassStorageDetailsController.java
index 90553bc..7eb1bdc 100644
--- a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglassdetails/controller/RawGlassStorageDetailsController.java
+++ b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglassdetails/controller/RawGlassStorageDetailsController.java
@@ -1,9 +1,7 @@
package com.mes.rawglassdetails.controller;
-import com.mes.entity.request.GeneralRequest;
-import com.mes.menu.entity.SysMenu;
-import com.mes.rawglassdetails.entity.RawGlassStorageDetails;
+import com.mes.rawglassdetails.entity.request.RawGlassRequest;
import com.mes.rawglassdetails.service.RawGlassStorageDetailsService;
import com.mes.utils.Result;
import io.swagger.annotations.ApiOperation;
@@ -24,7 +22,6 @@
public class RawGlassStorageDetailsController {
@Autowired
-// RawGlassStorageDetailsService rawGlassStorageDetailsService;
private RawGlassStorageDetailsService rawGlassStorageDetailsService;
@ApiOperation("宸ヤ綅鐘舵��")
@PostMapping("/updateEnableState")
@@ -38,12 +35,11 @@
}
}
- @ApiOperation("鏂板鍏ュ簱")
- @PostMapping("/save")
- public Result save(@Validated @RequestBody RawGlassStorageDetails rawGlassStorageDetails) {
-// rawGlassStorageDetailsService.save(rawGlassStorageDetails);
-// GeneralRequest request=new GeneralRequest();
- return Result.success();
+ @ApiOperation("鍘熺墖鍏ュ簱")
+ @PostMapping("/patternWarehousing")
+ public Result<String> patternWarehousing(@Validated @RequestBody RawGlassRequest request) {
+
+ return Result.build(200, "鍏ュ簱宸插畬鎴愶紝绛夊緟浠诲姟鎵ц", rawGlassStorageDetailsService.patternWarehousing(request));
}
diff --git a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglassdetails/entity/RawGlassStorageDetails.java b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglassdetails/entity/RawGlassStorageDetails.java
index cff3d2e..1f99472 100644
--- a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglassdetails/entity/RawGlassStorageDetails.java
+++ b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglassdetails/entity/RawGlassStorageDetails.java
@@ -2,12 +2,11 @@
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
-import java.time.LocalDateTime;
-import java.io.Serializable;
-import java.util.Date;
-
import lombok.Data;
import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+import java.util.Date;
/**
* <p>
@@ -67,4 +66,10 @@
private String remainQuantity;
+ /**
+ * 鐘舵��
+ */
+ private int state;
+
+
}
diff --git a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglassdetails/entity/request/RawGlassRequest.java b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglassdetails/entity/request/RawGlassRequest.java
new file mode 100644
index 0000000..8b60c17
--- /dev/null
+++ b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglassdetails/entity/request/RawGlassRequest.java
@@ -0,0 +1,42 @@
+package com.mes.rawglassdetails.entity.request;
+
+import lombok.Data;
+
+/**
+ * @Author : zhoush
+ * @Date: 2024/9/20 16:31
+ * @Description:
+ */
+@Data
+public class RawGlassRequest {
+
+ /**
+ * 鍘熺墖瀹�
+ */
+ private Double patternWidth;
+
+ /**
+ * 鍘熺墖楂�
+ */
+ private Double patternHeight;
+
+ /**
+ * 鍘熺墖鍘氬害
+ */
+ private Double patternThickness;
+
+ /**
+ * 鑶滅郴
+ */
+ private String filmsId;
+
+ /**
+ * 鍓╀綑鏁伴噺
+ */
+ private String remainQuantity;
+
+ /**
+ * 鏍呮牸鍙�
+ */
+ private Integer slot;
+}
diff --git a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglassdetails/service/RawGlassStorageDetailsService.java b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglassdetails/service/RawGlassStorageDetailsService.java
index 5c8cd03..57237c0 100644
--- a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglassdetails/service/RawGlassStorageDetailsService.java
+++ b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglassdetails/service/RawGlassStorageDetailsService.java
@@ -2,7 +2,7 @@
import com.baomidou.mybatisplus.extension.service.IService;
import com.mes.rawglassdetails.entity.RawGlassStorageDetails;
-import com.mes.rawglasstask.entity.RawGlassStorageTask;
+import com.mes.rawglassdetails.entity.request.RawGlassRequest;
import java.util.List;
@@ -11,16 +11,37 @@
* @since 2024-07-09 14:51:27
*/
public interface RawGlassStorageDetailsService extends IService<RawGlassStorageDetails> {
+
List<RawGlassStorageDetails> selectDetails();
- boolean updateRawGlassStorageDetails(String films_id);//瑕佸ぇ鍐欒繖涓�
+
/**
- *鍒犻櫎琛�
+ * 瑕佸ぇ鍐欒繖涓�
+ *
+ * @param films_id
+ * @return
+ */
+ boolean updateRawGlassStorageDetails(String films_id);
+
+ /**
+ * 鍒犻櫎琛� 鍏堝湪杩欓噷鍒� 鐒跺悗鐐归偅涓浉鍏抽棶棰�
+ *
* @return boolean
*/
- boolean deleteRawGlassStorageDetails(String device_id);//鍏堝湪杩欓噷鍒� 鐒跺悗鐐归偅涓浉鍏抽棶棰�
+ boolean deleteRawGlassStorageDetails(String device_id);
+
/**
- *鏂板琛�
+ * 鏂板琛�
+ *
* @return boolean
*/
boolean insertRawGlassStorageDetails(RawGlassStorageDetails rw);
+
+
+ /**
+ * 鍘熺墖鍏ュ簱
+ *
+ * @param request
+ * @return
+ */
+ String patternWarehousing(RawGlassRequest request);
}
\ No newline at end of file
diff --git a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglassdetails/service/impl/RawGlassStorageDetailsServiceImpl.java b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglassdetails/service/impl/RawGlassStorageDetailsServiceImpl.java
index 771ad09..a71cc7f 100644
--- a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglassdetails/service/impl/RawGlassStorageDetailsServiceImpl.java
+++ b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglassdetails/service/impl/RawGlassStorageDetailsServiceImpl.java
@@ -3,16 +3,15 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.mes.common.config.Const;
import com.mes.rawglassdetails.entity.RawGlassStorageDetails;
+import com.mes.rawglassdetails.entity.request.RawGlassRequest;
import com.mes.rawglassdetails.mapper.RawGlassStorageDetailsMapper;
import com.mes.rawglassdetails.service.RawGlassStorageDetailsService;
-import com.mes.rawglasstask.entity.RawGlassStorageTask;
-import com.mes.rawglasstask.mapper.RawGlassStorageTaskMapper;
-import com.mes.rawglasstask.service.RawGlassStorageTaskService;
import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
-import java.util.ArrayList;
import java.util.List;
/**
@@ -26,8 +25,8 @@
@Override
public boolean updateRawGlassStorageDetails(String films_id) {
UpdateWrapper<RawGlassStorageDetails> wrapper = new UpdateWrapper<>(); //杩欎釜绫诲瀷瀹氫箟閿欎簡锛屼笉搴旇鏄痶asking
- wrapper.set("films_id","1005")
- .eq( "films_id",films_id);
+ wrapper.set("films_id", "1005")
+ .eq("films_id", films_id);
return update(wrapper);//杩欎釜鏂规硶榛樿杩斿洖鐨勫氨鏄痓ool绫诲瀷 鎵�鏈夊彲浠ョ洿鎺eturn杩欎釜鏂规硶锛宱k浜嗭紝浣犳甯稿垱寤烘柟娉曞幓涓婁竴灞傚垱
}
@@ -36,7 +35,7 @@
public boolean deleteRawGlassStorageDetails(String device_id) {
QueryWrapper<RawGlassStorageDetails> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("device_id", device_id);
- return remove(queryWrapper);//remove鎵嶆槸鍒犻櫎锛宒elete寰楃敤鍙﹀鐨勪緷璧栵紝榛樿鏂规硶鏄痳emove杩斿洖bool
+ return remove(queryWrapper);//remove鎵嶆槸鍒犻櫎锛宒elete寰楃敤鍙﹀鐨勪緷璧栵紝榛樿鏂规硶鏄痳emove杩斿洖bool
}
@Override
@@ -47,9 +46,20 @@
// return list(queryWrapper);
return list();
}
+
@Override
- public boolean insertRawGlassStorageDetails(RawGlassStorageDetails rw){
+ public boolean insertRawGlassStorageDetails(RawGlassStorageDetails rw) {
return this.save(rw);
}
+ @Override
+ public String patternWarehousing(RawGlassRequest request) {
+ //todo:鍘熺墖淇℃伅瀛樺叆璇︽儏琛�
+ RawGlassStorageDetails details = new RawGlassStorageDetails();
+ BeanUtils.copyProperties(request, details);
+ details.setState(Const.GLASS_STATE_IN);
+ save(details);
+ return null;
+ }
+
}
\ No newline at end of file
diff --git a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglassstation/mapper/RawGlassStorageStationMapper.java b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglassstation/mapper/RawGlassStorageStationMapper.java
index 2e3a28e..86c0b45 100644
--- a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglassstation/mapper/RawGlassStorageStationMapper.java
+++ b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglassstation/mapper/RawGlassStorageStationMapper.java
@@ -1,7 +1,10 @@
package com.mes.rawglassstation.mapper;
-import com.mes.rawglassstation.entity.RawGlassStorageStation;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.mes.rawglassstation.entity.RawGlassStorageStation;
+import com.mes.rawglasstask.entity.RawGlassStorageTask;
+
+import java.util.List;
/**
* <p>
@@ -13,4 +16,5 @@
*/
public interface RawGlassStorageStationMapper extends BaseMapper<RawGlassStorageStation> {
+ List<RawGlassStorageTask> listRawGlassDetails();
}
diff --git a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglassstation/mapper/xml/RawGlassStorageStationMapper.xml b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglassstation/mapper/xml/RawGlassStorageStationMapper.xml
deleted file mode 100644
index 2f85aa9..0000000
--- a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglassstation/mapper/xml/RawGlassStorageStationMapper.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.mes.raw_glass_storage_station.mapper.RawGlassStorageStationMapper">
-
-</mapper>
diff --git a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglassstation/service/RawGlassStorageStationService.java b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglassstation/service/RawGlassStorageStationService.java
index 30dcd2a..ed790f1 100644
--- a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglassstation/service/RawGlassStorageStationService.java
+++ b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglassstation/service/RawGlassStorageStationService.java
@@ -12,7 +12,12 @@
*/
public interface RawGlassStorageStationService extends IService<RawGlassStorageStation> {
List<RawGlassStorageStation> selectStations();
+
boolean updateRawGlassStorageStation(String slot);
+
boolean deleteRawGlassStorageStation(String device_id);
+
boolean insertRawGlassStorageStation(RawGlassStorageStation rw);
+
+ List<RawGlassStorageTask> listRawGlassDetails();
}
\ No newline at end of file
diff --git a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglassstation/service/impl/RawGlassStorageStationServiceImpl.java b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglassstation/service/impl/RawGlassStorageStationServiceImpl.java
index 353f1b8..b976035 100644
--- a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglassstation/service/impl/RawGlassStorageStationServiceImpl.java
+++ b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglassstation/service/impl/RawGlassStorageStationServiceImpl.java
@@ -6,10 +6,10 @@
import com.mes.rawglassstation.entity.RawGlassStorageStation;
import com.mes.rawglassstation.mapper.RawGlassStorageStationMapper;
import com.mes.rawglassstation.service.RawGlassStorageStationService;
+import com.mes.rawglasstask.entity.RawGlassStorageTask;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
-import java.util.ArrayList;
import java.util.List;
/**
@@ -35,7 +35,7 @@
public boolean deleteRawGlassStorageStation(String device_id) {
QueryWrapper<RawGlassStorageStation> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("device_id", device_id);
- return remove(queryWrapper);
+ return remove(queryWrapper);
}
@Override
@@ -43,6 +43,10 @@
return this.save(rw);
}
+ @Override
+ public List<RawGlassStorageTask> listRawGlassDetails() {
+ return baseMapper.listRawGlassDetails();
+ }
}
\ No newline at end of file
diff --git a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglasstask/controller/RawGlassStorageTaskController.java b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglasstask/controller/RawGlassStorageTaskController.java
index 8b10bb1..e5aea4c 100644
--- a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglasstask/controller/RawGlassStorageTaskController.java
+++ b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglasstask/controller/RawGlassStorageTaskController.java
@@ -1,14 +1,11 @@
package com.mes.rawglasstask.controller;
-import com.mes.rawglassdetails.entity.RawGlassStorageDetails;
-import com.mes.rawglasstask.entity.RawGlassStorageTask;
import com.mes.rawglasstask.entity.request.RawGlassTaskRequest;
import com.mes.rawglasstask.service.RawGlassStorageTaskService;
import com.mes.utils.Result;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -16,21 +13,23 @@
/**
* <p>
- * 鍓嶇鎺у埗鍣�
+ * 鍘熺墖浠诲姟鎺у埗鍣�
* </p>
*
* @author wf
* @since 2024-09-10
*/
@RestController
-@RequestMapping("/raw_glass_storage_task")
+@RequestMapping("/rawGlassStorageTask")
public class RawGlassStorageTaskController {
+
@Autowired
- private RawGlassStorageTaskService rwService; //杩欓噷鏄綘瀹氫箟璋冪敤鐨剆ervice锛岃繖涓槸鎶ュ伐鐨�
- @ApiOperation("鍘熺墖浠撳偍鏁版嵁鏌ヨ")
- @PostMapping("/selectRawglasstask")
- public Result selectDamage(@RequestBody RawGlassTaskRequest rw) {
- return Result.build(200,"鏌ヨ鎴愬姛", rwService.setRawGlassTaskRequest(rw));
+ private RawGlassStorageTaskService rawGlassStorageTaskService;
+
+ @ApiOperation("璁剧疆鍘熺墖浠撳偍鏌ヨ鏉′欢")
+ @PostMapping("/setRawGlassTaskRequest")
+ public Result setRawGlassTaskRequest(@RequestBody RawGlassTaskRequest request) {
+ return Result.build(200, "鏌ヨ鎴愬姛", rawGlassStorageTaskService.setRawGlassTaskRequest(request));
}
}
diff --git a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglasstask/entity/RawGlassStorageTask.java b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglasstask/entity/RawGlassStorageTask.java
index 8026eab..a31fa99 100644
--- a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglasstask/entity/RawGlassStorageTask.java
+++ b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglasstask/entity/RawGlassStorageTask.java
@@ -2,10 +2,10 @@
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
-import java.time.LocalDateTime;
-import java.io.Serializable;
import lombok.Data;
import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
/**
* <p>
@@ -26,11 +26,6 @@
private Long id;
/**
- * 浠诲姟ID
- */
- private Integer enableId;
-
- /**
* 璧峰鏍煎瓙
*/
private Integer originateSlot;
@@ -48,12 +43,12 @@
/**
* 浠诲姟绫诲瀷
*/
- private Integer enableType;
+ private Integer taskType;
/**
* 浠诲姟鐘舵��
*/
- private Integer enableState;
+ private Integer taskState;
/**
* 鍒涘缓鏃堕棿
diff --git a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglasstask/entity/request/RawGlassTaskRequest.java b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglasstask/entity/request/RawGlassTaskRequest.java
index 91489d1..be97a9b 100644
--- a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglasstask/entity/request/RawGlassTaskRequest.java
+++ b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglasstask/entity/request/RawGlassTaskRequest.java
@@ -1,9 +1,6 @@
package com.mes.rawglasstask.entity.request;
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
-import com.baomidou.mybatisplus.core.conditions.segments.MergeSegments;
import com.fasterxml.jackson.annotation.JsonFormat;
-import com.mes.rawglasstask.entity.RawGlassStorageTask;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
@@ -16,24 +13,23 @@
/**
* 浠诲姟绫诲瀷 1 鍏ュ簱 2 鍑哄簱 3 璋冨害
*/
- private List<Integer> enableState;
+ private List<Integer> taskState;
/**
* 浠诲姟鐘舵�� 1 鏂板缓 2 鎵ц涓� 3 瀹屾垚
*/
- private List<Integer> enableType;
+ private List<Integer> taskType;
/**
* 寮�濮嬫椂闂�
*/
- @DateTimeFormat(pattern = "yyyy-MM-dd")
- @JsonFormat(pattern = "yyyy-MM-dd")
- private Date createTime;
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date beginDate;
/**
* 缁撴潫鏃堕棿
*/
- @DateTimeFormat(pattern = "yyyy-MM-dd")
- @JsonFormat(pattern = "yyyy-MM-dd")
- private Date patternQuantity;
-
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date endDate;
}
diff --git a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglasstask/service/RawGlassStorageTaskService.java b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglasstask/service/RawGlassStorageTaskService.java
index 6353bcb..887eb62 100644
--- a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglasstask/service/RawGlassStorageTaskService.java
+++ b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglasstask/service/RawGlassStorageTaskService.java
@@ -5,7 +5,6 @@
import com.mes.rawglasstask.entity.request.RawGlassTaskRequest;
import java.util.List;
-import java.util.Map;
/**
* @author system
@@ -13,12 +12,18 @@
*/
public interface RawGlassStorageTaskService extends IService<RawGlassStorageTask> {
- List<RawGlassStorageTask> findAll();
- String setRawGlassTaskRequest(RawGlassTaskRequest request);
+ /**
+ * 鏌ヨ鍘熺墖浠撳偍浠诲姟璇︽儏
+ *
+ * @return
+ */
+ List<RawGlassStorageTask> listRawGlassTask();
- List<RawGlassStorageTask> selectTask();
- List<RawGlassStorageTask> selectTasking(RawGlassStorageTask rawGlassStorageTask);
- boolean updateRawGlassStorageTask(String originate_slot);
- boolean deleteRawGlassStorageTask(String id);
- boolean insertRawGlassStorageTask(RawGlassStorageTask rw);
+ /**
+ * 璁剧疆鍘熺墖浠撳偍鏌ヨ鏉′欢
+ *
+ * @param request
+ * @return
+ */
+ String setRawGlassTaskRequest(RawGlassTaskRequest request);
}
\ No newline at end of file
diff --git a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglasstask/service/impl/RawGlassRawGlassStorageTaskServiceImpl.java b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglasstask/service/impl/RawGlassRawGlassStorageTaskServiceImpl.java
index 40b5ca3..aae2bf7 100644
--- a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglasstask/service/impl/RawGlassRawGlassStorageTaskServiceImpl.java
+++ b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglasstask/service/impl/RawGlassRawGlassStorageTaskServiceImpl.java
@@ -1,25 +1,19 @@
package com.mes.rawglasstask.service.impl;
-import com.baomidou.mybatisplus.core.assist.ISqlRunner;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import cn.hutool.core.collection.CollectionUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.mes.common.utils.RedisUtil;
-import com.mes.pp.entity.request.Reportingdamage;
import com.mes.rawglasstask.entity.RawGlassStorageTask;
import com.mes.rawglasstask.entity.request.RawGlassTaskRequest;
import com.mes.rawglasstask.mapper.RawGlassStorageTaskMapper;
import com.mes.rawglasstask.service.RawGlassStorageTaskService;
+import com.mes.tools.DateUtil;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-import java.text.DateFormat;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.Date;
import java.util.List;
-import java.util.Map;
/**
* @author system
@@ -29,41 +23,31 @@
@Slf4j
public class RawGlassRawGlassStorageTaskServiceImpl extends ServiceImpl<RawGlassStorageTaskMapper, RawGlassStorageTask> implements RawGlassStorageTaskService {
-
@Autowired
RedisUtil redisUtil;
@Override
- public List<RawGlassStorageTask> findAll() {
+ public List<RawGlassStorageTask> listRawGlassTask() {
RawGlassTaskRequest request = redisUtil.getCacheObject("rawGlassTaskRequest");
if (null == request) {
request = new RawGlassTaskRequest();
+ }
+ if (request.getBeginDate() == null) {
//璁剧疆榛樿鏃堕棿 startDate锛氬紑濮嬫椂闂� endDate锛氱粨鏉熸椂闂�
- DateFormat df = new SimpleDateFormat("yyyy-MM-dd");
- Date startDate=null;
- Date endDate=null;
- try {
- startDate= df.parse("2022-01-01");
- endDate= df.parse("2025-01-01");
- }catch (ParseException e){
- e.printStackTrace();
- }
- request.setCreateTime(startDate);//
- request.setPatternQuantity(endDate);
- //return null;
+ request.setBeginDate(DateUtil.getBeginDate());
+ request.setEndDate(DateUtil.getEndDate());
}
+ return list(new LambdaQueryWrapper<RawGlassStorageTask>()
+ .between(RawGlassStorageTask::getCreateTime, request.getBeginDate(), request.getEndDate())
+ .in(CollectionUtil.isNotEmpty(request.getTaskState()), RawGlassStorageTask::getTaskState, request.getTaskState())
+ .in(CollectionUtil.isNotEmpty(request.getTaskType()), RawGlassStorageTask::getTaskType, request.getTaskType())
+ .orderByDesc(RawGlassStorageTask::getCreateTime));
- QueryWrapper<RawGlassStorageTask> queryWrapper = new QueryWrapper<>();
- queryWrapper.ge("create_time", request.getCreateTime())//澶т簬鏃堕棿
- .le("create_time",request.getPatternQuantity());//灏忎簬鏃堕棿
-// .orderByDesc("enable_id");//鎺掑簭瀛楁
- if(!request.getEnableType().isEmpty()&&request.getEnableType().size()>0){
- queryWrapper.eq("enable_type", request.getEnableType().get(0));
- }if(!request.getEnableState().isEmpty()&&request.getEnableState().size()>0){
- queryWrapper.eq("enable_state", request.getEnableState().get(0));
- }
-
- return baseMapper.selectList(queryWrapper);
+// return list(new QueryWrapper<RawGlassStorageTask>()
+// .in(CollectionUtil.isNotEmpty(request.getTaskState()), "task_state", request.getTaskState())
+// .in(CollectionUtil.isNotEmpty(request.getTaskType()), "task_type", request.getTaskType())
+// .between("create_time", request.getBeginDate(), request.getEndDate())
+// .orderByDesc("create_time"));
}
@Override
@@ -73,49 +57,7 @@
} else {
redisUtil.setCacheObject("rawGlassTaskRequest", request);
}
- log.info("鍓嶇浼犲叆鍙傛暟锛歿}",request);
+ log.info("鍓嶇浼犲叆鍙傛暟锛歿}", request);
return "success";
}
-
- @Override
- public List<RawGlassStorageTask> selectTask() {
- return list();
- }
-
- @Override
- public List<RawGlassStorageTask> selectTasking(RawGlassStorageTask rw) {
- QueryWrapper<RawGlassStorageTask> queryWrapper = new QueryWrapper<>();
- //涓嬮潰杩欎釜鍒楁槸鏌ヨ瀛楁锛屼笉瑕佸彲浠ュ垹鎺夐粯璁ゆ煡璇㈠叏閮�
- queryWrapper.ge("create_time", rw.getCreateTime())//澶т簬鏃堕棿
- .le("create_time",rw.getPatternQuantity())//灏忎簬鏃堕棿
- .groupBy("enable_id");//鎺掑簭瀛楁
- if(rw.getEnableType()!=null){
- queryWrapper.eq("enable_type", rw.getEnableType());
- }if(rw.getEnableState()!=null){
- queryWrapper.eq("enable_state", rw.getEnableState());
- }
- return baseMapper.selectList(queryWrapper);
-// return list(queryWrapper);
- }
- @Override
- public boolean insertRawGlassStorageTask(RawGlassStorageTask rw) {
- return this.save(rw);
- }
- @Override
- public boolean updateRawGlassStorageTask(String originate_slot) {
- UpdateWrapper<RawGlassStorageTask> wrapper = new UpdateWrapper<>();
- wrapper.set("originate_slot","1005")
- .eq( "originate_slot",originate_slot);
- return update(wrapper);
- }
-
- @Override
- public boolean deleteRawGlassStorageTask(String id) {
- QueryWrapper<RawGlassStorageTask> queryWrapper = new QueryWrapper<>();
- queryWrapper.eq("id", id);
- return remove(queryWrapper);
- }
-
-
-
}
\ No newline at end of file
diff --git a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/resources/mapper/RawGlassStorageStationMapper.xml b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/resources/mapper/RawGlassStorageStationMapper.xml
new file mode 100644
index 0000000..d1a6d99
--- /dev/null
+++ b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/resources/mapper/RawGlassStorageStationMapper.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.mes.rawglassstation.mapper.RawGlassStorageStationMapper">
+
+ <resultMap id="baseMap" type="com.mes.rawglassdetails.entity.RawGlassStorageDetails">
+ <result column="device_id" property="deviceId"/>
+ <result column="slot" property="slotId"/>
+ <result column="pattern_width" property="patternWidth"/>
+ <result column="pattern_height" property="patternHeight"/>
+ <result column="pattern_thickness" property="patternThickness"/>
+ <result column="films_id" property="filmsId"/>
+ <result column="create_time" property="createTime"/>
+ <result column="remain_quantity" property="remainQuantity"/>
+ </resultMap>
+
+
+ <select id="listRawGlassDetails" resultMap="baseMap">
+ SELECT T.DEVICE_ID,
+ T.SLOT,
+ T1.PATTERN_WIDTH,
+ T1.PATTERN_HEIGHT,
+ T1.PATTERN_THICKNESS,
+ T1.FILMS_ID,
+ T1.CREATE_TIME,
+ T1.REMAIN_QUANTITY
+ FROM RAW_GLASS_STORAGE_STATION T
+ LEFT JOIN RAW_GLASS_STORAGE_DETAILS T1 ON T.DEVICE_ID = T1.DEVICE_ID
+ AND T.SLOT = T1.SLOT_ID
+ AND T1.STATE = 100
+ </select>
+</mapper>
--
Gitblit v1.8.0