From c042e9a6e38d7264d053617f1a21b6ecf42f65cd Mon Sep 17 00:00:00 2001
From: gaoaoy <1042166043@qq.com>
Date: 星期一, 04 三月 2024 18:12:32 +0800
Subject: [PATCH] 6 bug修改
---
cnas-server/src/main/java/com/yuanchu/mom/mapper/DeviceMapper.java | 6 +++
cnas-server/src/main/java/com/yuanchu/mom/service/impl/DeviceServiceImpl.java | 14 ++++++-
cnas-server/src/main/resources/mapper/DeviceMapper.xml | 29 ++++++++++++++
cnas-server/src/main/java/com/yuanchu/mom/controller/DeviceController.java | 14 +++++++
cnas-server/src/main/java/com/yuanchu/mom/service/DeviceService.java | 4 ++
cnas-server/src/main/java/com/yuanchu/mom/pojo/Device.java | 5 ++
6 files changed, 69 insertions(+), 3 deletions(-)
diff --git a/cnas-server/src/main/java/com/yuanchu/mom/controller/DeviceController.java b/cnas-server/src/main/java/com/yuanchu/mom/controller/DeviceController.java
index 0757f5c..46b2a23 100644
--- a/cnas-server/src/main/java/com/yuanchu/mom/controller/DeviceController.java
+++ b/cnas-server/src/main/java/com/yuanchu/mom/controller/DeviceController.java
@@ -58,5 +58,19 @@
return Result.success(deviceService.selectEquipmentOverview());
}
+ @ApiOperation(value = "鑾峰彇琚巿鏉冧汉")
+ @GetMapping("/authorizedPerson")
+ @ValueAuth
+ public Result authorizedPerson() {
+ return Result.success(deviceService.authorizedPerson());
+ }
+
+ @ApiOperation(value = "鎼滅储")
+ @GetMapping("/search")
+ @ValueAuth
+ public Result search(Integer status, String deviceName, String specificationModel, String largeCategory) {
+ return Result.success(deviceService.search(status, deviceName, specificationModel, largeCategory));
+ }
+
}
diff --git a/cnas-server/src/main/java/com/yuanchu/mom/mapper/DeviceMapper.java b/cnas-server/src/main/java/com/yuanchu/mom/mapper/DeviceMapper.java
index 74a72d1..5b9e982 100644
--- a/cnas-server/src/main/java/com/yuanchu/mom/mapper/DeviceMapper.java
+++ b/cnas-server/src/main/java/com/yuanchu/mom/mapper/DeviceMapper.java
@@ -5,6 +5,7 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yuanchu.mom.pojo.Device;
+import org.springframework.data.repository.query.Param;
import java.util.List;
@@ -16,5 +17,10 @@
IPage<Device> selectDeviceParameter(Page page, QueryWrapper<Device> ew);
List<Device> selectEquipmentOverview();
+
+ List<Device> authorizedPerson();
+
+ List<Device> search(@Param(value = "status") Integer status, @Param(value = "deviceName") String deviceName,
+ @Param(value = "specificationModel") String specificationModel, @Param(value = "largeCategory") String largeCategory);
}
diff --git a/cnas-server/src/main/java/com/yuanchu/mom/pojo/Device.java b/cnas-server/src/main/java/com/yuanchu/mom/pojo/Device.java
index 236bdbd..18954c3 100644
--- a/cnas-server/src/main/java/com/yuanchu/mom/pojo/Device.java
+++ b/cnas-server/src/main/java/com/yuanchu/mom/pojo/Device.java
@@ -128,6 +128,10 @@
@ApiModelProperty(value = "鏍″噯璇佷功")
private String calibrationCerticate;
+ @ValueTableShow(26)
+ @ApiModelProperty(value = "鐘舵��")
+ private Integer status;
+
@ApiModelProperty(value = "鍒涘缓浜篿d")
@TableField(fill = FieldFill.INSERT)
private Integer createUser;
@@ -141,4 +145,5 @@
@TableField(fill = FieldFill.INSERT)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime createTime;
+
}
diff --git a/cnas-server/src/main/java/com/yuanchu/mom/service/DeviceService.java b/cnas-server/src/main/java/com/yuanchu/mom/service/DeviceService.java
index de8f127..99fb7fb 100644
--- a/cnas-server/src/main/java/com/yuanchu/mom/service/DeviceService.java
+++ b/cnas-server/src/main/java/com/yuanchu/mom/service/DeviceService.java
@@ -22,5 +22,9 @@
List<Device> selectEquipmentOverview();
+ List<Device> authorizedPerson();
+
+ List<Device> search( Integer status, String deviceName, String specificationModel, String largeCategory);
+
}
diff --git a/cnas-server/src/main/java/com/yuanchu/mom/service/impl/DeviceServiceImpl.java b/cnas-server/src/main/java/com/yuanchu/mom/service/impl/DeviceServiceImpl.java
index 4715647..0b055d1 100644
--- a/cnas-server/src/main/java/com/yuanchu/mom/service/impl/DeviceServiceImpl.java
+++ b/cnas-server/src/main/java/com/yuanchu/mom/service/impl/DeviceServiceImpl.java
@@ -31,14 +31,14 @@
Map<String, Object> map = new HashMap<>();
map.put("head", PrintChina.printChina(Device.class));
Map<String, Integer> map1 = getLook.selectPowerByMethodAndUserId("selectDeviceParameter");
- if(map1.get("look")==1) itemParameter.setCreateUser(map1.get("userId"));
+ if (map1.get("look") == 1) itemParameter.setCreateUser(map1.get("userId"));
map.put("body", deviceMapper.selectDeviceParameter(page, QueryWrappers.queryWrappers(itemParameter)));
return map;
}
@Override
public int addDeviceParameter(Device itemParameter) {
- return deviceMapper.insert(itemParameter);
+ return deviceMapper.insert(itemParameter);
}
@Override
@@ -56,5 +56,15 @@
return deviceMapper.selectEquipmentOverview();
}
+ @Override
+ public List<Device> authorizedPerson() {
+ return deviceMapper.authorizedPerson();
+ }
+
+ @Override
+ public List<Device> search(Integer status, String deviceName, String specificationModel, String largeCategory) {
+ return deviceMapper.search(status, deviceName, specificationModel, largeCategory);
+ }
+
}
diff --git a/cnas-server/src/main/resources/mapper/DeviceMapper.xml b/cnas-server/src/main/resources/mapper/DeviceMapper.xml
index e15e4f1..2115459 100644
--- a/cnas-server/src/main/resources/mapper/DeviceMapper.xml
+++ b/cnas-server/src/main/resources/mapper/DeviceMapper.xml
@@ -35,7 +35,8 @@
create_user,
create_time,
update_user,
- update_time
+ update_time,
+ status,
from device
) a
<if test="ew.customSqlSegment != null and ew.customSqlSegment != ''">
@@ -49,6 +50,7 @@
specificationModel,
deviceStatus,
create_user,
+ status,
update_time
from device
) a
@@ -56,4 +58,29 @@
${ew.customSqlSegment}
</if>
</select>
+ <select id="authorizedPerson" resultType="com.yuanchu.mom.pojo.Device">
+ select *
+ from (select id,
+ authorized_person,
+ status
+ from device) a
+ </select>
+ <select id="search" resultType="com.yuanchu.mom.pojo.Device">
+ select *
+ from device
+ <where>
+ <if test="status!=null">
+ and status = #{status}
+ </if>
+ <if test="deviceName!=null and deviceName!=''">
+ and device_name like concat('%',#{deviceName},'%')
+ </if>
+ <if test="specificationModel!=null and specificationModel!= ''">
+ and specification_model = #{specificationModel}
+ </if>
+ <if test="largeCategory!=null and largeCategory!= ''">
+ and large_category = #{largeCategory}
+ </if>
+ </where>
+ </select>
</mapper>
--
Gitblit v1.9.3