From 8936f5f9af4c6e0221b5a49f2c905efd4df58496 Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期五, 11 八月 2023 17:50:07 +0800
Subject: [PATCH] MOM系统-8-11本地test
---
standard-server/src/main/java/com/yuanchu/mom/mapper/DeviceMapper.java | 4 +
standard-server/src/main/java/com/yuanchu/mom/service/DeviceService.java | 8 ++
standard-server/src/main/java/com/yuanchu/mom/service/impl/DeviceServiceImpl.java | 29 +++++++++
standard-server/src/main/resources/mapper/DeviceMapper.xml | 30 ++++++++-
standard-server/src/main/java/com/yuanchu/mom/pojo/Device.java | 2
standard-server/src/main/java/com/yuanchu/mom/service/RawInsProductService.java | 4 +
standard-server/src/main/resources/mapper/RawInsProductMapper.xml | 16 +++++
standard-server/src/main/java/com/yuanchu/mom/mapper/RawInsProductMapper.java | 4 +
standard-server/src/main/java/com/yuanchu/mom/controller/DeviceController.java | 68 +++++++++++++++++++++-
pom.xml | 2
standard-server/src/main/java/com/yuanchu/mom/service/impl/RawInsProductServiceImpl.java | 10 +++
11 files changed, 162 insertions(+), 15 deletions(-)
diff --git a/pom.xml b/pom.xml
index f3b8161..f50f167 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,7 +14,7 @@
<name>mom_ocean</name>
<description>mom_ocean</description>
<packaging>pom</packaging>
- <!--test-->
+
<modules>
<module>framework</module>
<module>user-server</module>
diff --git a/standard-server/src/main/java/com/yuanchu/mom/controller/DeviceController.java b/standard-server/src/main/java/com/yuanchu/mom/controller/DeviceController.java
index 7a1724a..4233c11 100644
--- a/standard-server/src/main/java/com/yuanchu/mom/controller/DeviceController.java
+++ b/standard-server/src/main/java/com/yuanchu/mom/controller/DeviceController.java
@@ -5,6 +5,7 @@
import com.yuanchu.mom.service.DeviceService;
import com.yuanchu.mom.service.RawInsProductService;
import com.yuanchu.mom.service.UserService;
+import com.yuanchu.mom.utils.MyUtil;
import com.yuanchu.mom.vo.Result;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
@@ -65,13 +66,14 @@
return Result.success(maps);
}
- @ApiOperation(value = "浜岀骇鏍�", tags = "QMS绠＄悊-->瀹為獙瀹ょ鐞�")
+ @ApiOperation(value = "浜岀骇鏍�:榛樿鐢熶骇璁惧", tags = "QMS绠＄悊-->瀹為獙瀹ょ鐞�")
@ApiImplicitParams(value = {
- @ApiImplicitParam(name = "type", value = "绫诲瀷", dataTypeClass = String.class)
+ @ApiImplicitParam(name = "type", value = "绫诲瀷", dataTypeClass = String.class),
+ @ApiImplicitParam(name = "search_class", value = "鎼滅储妗嗗唴瀹�", dataTypeClass = String.class)
})
@GetMapping("/two_tree")
- public Result<?> deviceTwoTree(@RequestParam(defaultValue = "1") Integer type){
- List<Map<String, Object>> mapList= deviceService.deviceTwoTree(type);
+ public Result<?> deviceTwoTree(@RequestParam(defaultValue = "1") Integer type, String search_class){
+ List<Map<String, Object>> mapList= deviceService.deviceTwoTree(type, search_class);
return Result.success(mapList);
}
@@ -93,4 +95,62 @@
IPage<Map<String, Object>> mapList = rawInsProductService.selectPageDevice(pageNo, pageSize, codeOrNameOrModel);
return Result.success(mapList);
}
+
+ @ApiOperation(value = "鏂板浠櫒璁惧锛氭牴鎹楠岄」鐩甀D鏌ヨ鏁版嵁", tags = "QMS绠＄悊-->瀹為獙瀹ょ鐞�")
+ @ApiImplicitParams(value = {
+ @ApiImplicitParam(name = "inspectId", value = "妫�楠岄」鐩甀d", dataTypeClass = Integer.class, required = true)
+ })
+ @GetMapping("/inspectId")
+ public Result<?> inspectIdSelect(Integer inspectId){
+ Map<String, Object> map = rawInsProductService.inspectIdSelect(inspectId);
+ return Result.success(map);
+ }
+
+ @ApiOperation(value = "鏂板浠櫒璁惧锛氭煡璇㈢埗绾у垎绫�", tags = "QMS绠＄悊-->瀹為獙瀹ょ鐞�")
+ @GetMapping("/parent_classification")
+ public Result<?> parentClassification(){
+ List<Map<String, Object>> map = rawInsProductService.parentClassification();
+ return Result.success(map);
+ }
+
+ @ApiOperation(value = "瀹為獙瀹ゆā鍧楄〃鏍兼暟鎹�", tags = "QMS绠＄悊-->瀹為獙瀹ょ鐞�")
+ @ApiImplicitParams(value = {
+ @ApiImplicitParam(name = "type", value = "绫诲瀷:榛樿鐢熶骇璁惧", dataTypeClass = Integer.class),
+ @ApiImplicitParam(name = "codeNameModel", value = "缂栧彿鍚嶇О瑙勬牸鍨嬪彿", dataTypeClass = String.class),
+ @ApiImplicitParam(name = "deviceStatue", value = "璁惧鐘舵��", dataTypeClass = Integer.class),
+ @ApiImplicitParam(name = "deviceId", value = "璁惧Id", dataTypeClass = Integer.class),
+ @ApiImplicitParam(name = "fatherName", value = "鐖剁骇鍒嗙被", dataTypeClass = String.class)
+ })
+ @GetMapping("/table_list")
+ public Result<?> tableData(String codeNameModel, @RequestParam(defaultValue = "1") Integer type, Integer deviceStatue, Integer deviceId, String fatherName){
+ List<Map<String, Object>> map = deviceService.DevicePageList(codeNameModel, type, deviceStatue, deviceId, fatherName);
+ return Result.success(map);
+ }
+
+ @ApiOperation(value = "鍒犻櫎瀹為獙瀹ゆā鍧楁暟鎹�", tags = "QMS绠＄悊-->瀹為獙瀹ょ鐞�")
+ @ApiImplicitParams(value = {
+ @ApiImplicitParam(name = "deviceId", value = "鏍规嵁璁惧Id鍒犻櫎", dataTypeClass = Integer.class)
+ })
+ @DeleteMapping("/delete")
+ public Result<?> deviceDelete(Integer deviceId){
+ Integer map = deviceService.deviceDelete(deviceId);
+ if (map == 1){
+ return Result.success("鍒犻櫎鎴愬姛锛�");
+ }
+ return Result.fail("鍒犻櫎澶辫触锛�");
+ }
+
+ @ApiOperation(value = "鍒犻櫎鏍戞ā鍧楁暟鎹�", tags = "QMS绠＄悊-->瀹為獙瀹ょ鐞�")
+ @ApiImplicitParams(value = {
+ @ApiImplicitParam(name = "id", value = "鏍规嵁璁惧Id鍒犻櫎", dataTypeClass = Integer.class),
+ @ApiImplicitParam(name = "deviceFather", value = "鏍规嵁璁惧鍒嗙被鍒犻櫎", dataTypeClass = String.class)
+ })
+ @DeleteMapping("/deleteIdorFather")
+ public Result<?> deviceDeleteIdOrFather(Integer id, String deviceFather){
+ Integer map = deviceService.deviceDeleteIdOrFather(id, deviceFather);
+ if (map == 1){
+ return Result.success("鍒犻櫎鎴愬姛锛�");
+ }
+ return Result.fail("鍒犻櫎澶辫触锛�");
+ }
}
diff --git a/standard-server/src/main/java/com/yuanchu/mom/mapper/DeviceMapper.java b/standard-server/src/main/java/com/yuanchu/mom/mapper/DeviceMapper.java
index 2df7ac0..4b3a118 100644
--- a/standard-server/src/main/java/com/yuanchu/mom/mapper/DeviceMapper.java
+++ b/standard-server/src/main/java/com/yuanchu/mom/mapper/DeviceMapper.java
@@ -16,5 +16,7 @@
*/
public interface DeviceMapper extends BaseMapper<Device> {
- List<Map<String, Object>> deviceTwoTree(Integer type);
+ List<Map<String, Object>> deviceTwoTree(Integer type, String search_class);
+
+ List<Map<String, Object>> DevicePageList(String codeNameModel, Integer type, Integer deviceStatue, Integer deviceId, String fatherName);
}
diff --git a/standard-server/src/main/java/com/yuanchu/mom/mapper/RawInsProductMapper.java b/standard-server/src/main/java/com/yuanchu/mom/mapper/RawInsProductMapper.java
index fd5c37b..51635dc 100644
--- a/standard-server/src/main/java/com/yuanchu/mom/mapper/RawInsProductMapper.java
+++ b/standard-server/src/main/java/com/yuanchu/mom/mapper/RawInsProductMapper.java
@@ -18,5 +18,9 @@
List<Map<String, Object>> selectInspectIdAndName();
IPage<Map<String, Object>> selectPageDevice(Integer pageNo, Integer pageSize, String codeOrNameOrModel);
+
+ Map<String, Object> inspectIdSelect(Integer inspectId);
+
+ List<Map<String, Object>> parentClassification();
}
diff --git a/standard-server/src/main/java/com/yuanchu/mom/pojo/Device.java b/standard-server/src/main/java/com/yuanchu/mom/pojo/Device.java
index b067c77..741933a 100644
--- a/standard-server/src/main/java/com/yuanchu/mom/pojo/Device.java
+++ b/standard-server/src/main/java/com/yuanchu/mom/pojo/Device.java
@@ -29,7 +29,7 @@
private static final long serialVersionUID = 1L;
- @ApiModelProperty(value = "璁惧id")
+ @ApiModelProperty(value = "璁惧id", hidden = true)
@TableId(value = "id", type = IdType.AUTO)
private Integer id;
diff --git a/standard-server/src/main/java/com/yuanchu/mom/service/DeviceService.java b/standard-server/src/main/java/com/yuanchu/mom/service/DeviceService.java
index b6e6f00..0d01479 100644
--- a/standard-server/src/main/java/com/yuanchu/mom/service/DeviceService.java
+++ b/standard-server/src/main/java/com/yuanchu/mom/service/DeviceService.java
@@ -30,5 +30,11 @@
@Transactional(rollbackFor = Exception.class)
Boolean addDevice(Device device);
- List<Map<String, Object>> deviceTwoTree(Integer type);
+ List<Map<String, Object>> deviceTwoTree(Integer type, String search_class);
+
+ List<Map<String, Object>> DevicePageList(String codeNameModel, Integer type, Integer deviceStatue, Integer deviceId, String fatherName);
+
+ Integer deviceDelete(Integer deviceId);
+
+ Integer deviceDeleteIdOrFather(Integer id, String deviceFather);
}
diff --git a/standard-server/src/main/java/com/yuanchu/mom/service/RawInsProductService.java b/standard-server/src/main/java/com/yuanchu/mom/service/RawInsProductService.java
index 34968ee..92c76c8 100644
--- a/standard-server/src/main/java/com/yuanchu/mom/service/RawInsProductService.java
+++ b/standard-server/src/main/java/com/yuanchu/mom/service/RawInsProductService.java
@@ -25,5 +25,9 @@
List<Map<String, Object>> selectInspectIdAndName();
IPage<Map<String, Object>> selectPageDevice(Integer pageNo, Integer pageSize, String codeOrNameOrModel);
+
+ Map<String, Object> inspectIdSelect(Integer inspectId);
+
+ List<Map<String, Object>> parentClassification();
}
diff --git a/standard-server/src/main/java/com/yuanchu/mom/service/impl/DeviceServiceImpl.java b/standard-server/src/main/java/com/yuanchu/mom/service/impl/DeviceServiceImpl.java
index e04e90f..a889152 100644
--- a/standard-server/src/main/java/com/yuanchu/mom/service/impl/DeviceServiceImpl.java
+++ b/standard-server/src/main/java/com/yuanchu/mom/service/impl/DeviceServiceImpl.java
@@ -77,7 +77,32 @@
}
@Override
- public List<Map<String, Object>> deviceTwoTree(Integer type) {
- return deviceMapper.deviceTwoTree(type);
+ public List<Map<String, Object>> deviceTwoTree(Integer type, String search_class) {
+ return deviceMapper.deviceTwoTree(type, search_class);
+ }
+
+ @Override
+ public List<Map<String, Object>> DevicePageList(String codeNameModel,Integer type, Integer deviceStatue, Integer deviceId, String fatherName) {
+ return deviceMapper.DevicePageList(codeNameModel, type, deviceStatue, deviceId, fatherName);
+ }
+
+ @Override
+ public Integer deviceDelete(Integer deviceId) {
+ LambdaUpdateWrapper<Device> updateWrapper = new LambdaUpdateWrapper<>();
+ updateWrapper.eq(Device::getId, deviceId);
+ updateWrapper.set(Device::getState, 0);
+ return deviceMapper.update(new Device(), updateWrapper);
+ }
+
+ @Override
+ public Integer deviceDeleteIdOrFather(Integer id, String deviceFather) {
+ LambdaUpdateWrapper<Device> updateWrapper = new LambdaUpdateWrapper<>();
+ updateWrapper.set(Device::getState, 0);
+ if (id != null) {
+ updateWrapper.eq(Device::getId, id);
+ } else if (deviceFather != null) {
+ updateWrapper.eq(Device::getFather, deviceFather);
+ }
+ return deviceMapper.update(new Device(), updateWrapper);
}
}
diff --git a/standard-server/src/main/java/com/yuanchu/mom/service/impl/RawInsProductServiceImpl.java b/standard-server/src/main/java/com/yuanchu/mom/service/impl/RawInsProductServiceImpl.java
index b4ce94b..2cef33c 100644
--- a/standard-server/src/main/java/com/yuanchu/mom/service/impl/RawInsProductServiceImpl.java
+++ b/standard-server/src/main/java/com/yuanchu/mom/service/impl/RawInsProductServiceImpl.java
@@ -52,6 +52,16 @@
return rawInsProductMapper.selectPageDevice(pageNo, pageSize, codeOrNameOrModel);
}
+ @Override
+ public Map<String, Object> inspectIdSelect(Integer inspectId) {
+ return rawInsProductMapper.inspectIdSelect(inspectId);
+ }
+
+ @Override
+ public List<Map<String, Object>> parentClassification() {
+ return rawInsProductMapper.parentClassification();
+ }
+
/*鍒ゆ柇妫�娴嬪�兼槸鍚︽弧瓒虫爣鍑嗗�煎拰鍐呮帶鍊肩殑瑕佹眰,濡傛灉涓嶆弧瓒冲垯妫�楠岀粨璁轰负涓嶅悎鏍�*/
private int checkValues(String standardValueStr, String controlValueStr, String detectionValueStr) {
boolean isStandardValueSatisfied = isValueSatisfied(standardValueStr, detectionValueStr);
diff --git a/standard-server/src/main/resources/mapper/DeviceMapper.xml b/standard-server/src/main/resources/mapper/DeviceMapper.xml
index 8320a81..461895f 100644
--- a/standard-server/src/main/resources/mapper/DeviceMapper.xml
+++ b/standard-server/src/main/resources/mapper/DeviceMapper.xml
@@ -10,7 +10,7 @@
</select>
<resultMap id="deviceTwoTreeOneMap" type="map">
- <id property="father" column="father"/>
+ <id property="name" column="father"/>
<collection property="children" resultMap="deviceTwoTreeTwoMap" javaType="List"/>
</resultMap>
@@ -23,15 +23,35 @@
SELECT d.`id`, d.`name`, d.`father`
FROM device d
WHERE d.state = 1
- AND d.type = #{type}
+ AND d.type = #{type}
+ <if test="search_class !=null and search_class != ''">
+ AND d.`name` like concat('%',#{search_class},'%')
+ </if>
</select>
<select id="DevicePageList" resultType="Map">
- SELECT * FROM device d
- LEFT JOIN raw_ins_product r
- ON d.`id` = r.`device_id`
+ SELECT d.id, d.`code`, d.`name`, u.`name` keeper, DATE_FORMAT(d.`end_measure`,'%Y-%m-%d') end_measure, d.`device_status`, d.`factory`, r.`name` inspectProject, i.`name` testSample, i.`user_name`
+ FROM (device d, `user` u)
+ LEFT JOIN raw_ins_product r
+ ON d.`id` = r.`device_id`
+ LEFT JOIN raw_inspect i
+ ON r.`raw_inspect_id` = i.`id`
WHERE r.`test_state` IS NULL
AND d.`state` = 1
AND (r.`state` = 1 OR r.`state` IS NULL)
+ AND d.`keeper` = u.`id`
+ AND d.type = #{type}
+ <if test="codeNameModel != null and codeNameModel != ''">
+ AND (d.`name` LIKE CONCAT('%',#{codeNameModel},'%') OR d.`code` LIKE CONCAT('%',#{codeNameModel},'%') OR i.`specifications` LIKE CONCAT('%',#{codeNameModel},'%'))
+ </if>
+ <if test="deviceStatue != null and deviceStatue != ''">
+ AND d.`device_status` = #{deviceStatue}
+ </if>
+ <if test="deviceId != null and deviceId != ''">
+ AND d.id = #{deviceId}
+ </if>
+ <if test="fatherName != null and fatherName != ''">
+ AND d.`father` = #{fatherName}
+ </if>
</select>
</mapper>
diff --git a/standard-server/src/main/resources/mapper/RawInsProductMapper.xml b/standard-server/src/main/resources/mapper/RawInsProductMapper.xml
index 5f7d431..94f8892 100644
--- a/standard-server/src/main/resources/mapper/RawInsProductMapper.xml
+++ b/standard-server/src/main/resources/mapper/RawInsProductMapper.xml
@@ -15,4 +15,20 @@
<select id="selectPageDevice" resultType="map">
</select>
+
+ <select id="inspectIdSelect" resultType="map">
+ SELECT r.`name`, r.`specifications`, r.`user_name`
+ FROM raw_inspect r, raw_ins_product p
+ WHERE p.`id` = #{inspectId}
+ AND p.`state` = 1
+ AND r.`state` = 1
+ AND r.`id` = p.`raw_inspect_id`
+ </select>
+
+ <select id="parentClassification" resultType="map">
+ SELECT DISTINCT d.`father`
+ FROM device d
+ WHERE d.`state` = 1
+ AND d.`father` IS NOT NULL
+ </select>
</mapper>
--
Gitblit v1.9.3