From 941cc225c9c1f840aa1ddbeb2e999ba0ccc9c71d Mon Sep 17 00:00:00 2001
From: zhuo <2089219845@qq.com>
Date: 星期一, 03 三月 2025 10:29:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
cnas-device/src/main/java/com/ruoyi/device/service/impl/DeviceServiceImpl.java | 5 -----
cnas-device/src/main/resources/mapper/DeviceMapper.xml | 5 -----
ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml | 2 ++
cnas-device/src/main/java/com/ruoyi/device/service/DeviceService.java | 2 --
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java | 13 +++++++++++++
cnas-device/src/main/java/com/ruoyi/device/controller/DeviceController.java | 6 ------
cnas-device/src/main/java/com/ruoyi/device/mapper/DeviceMapper.java | 3 ---
7 files changed, 15 insertions(+), 21 deletions(-)
diff --git a/cnas-device/src/main/java/com/ruoyi/device/controller/DeviceController.java b/cnas-device/src/main/java/com/ruoyi/device/controller/DeviceController.java
index 36b2341..2e1f23f 100644
--- a/cnas-device/src/main/java/com/ruoyi/device/controller/DeviceController.java
+++ b/cnas-device/src/main/java/com/ruoyi/device/controller/DeviceController.java
@@ -134,12 +134,6 @@
}
}
- @ApiOperation(value = "鑾峰彇璁惧璐熻矗浜�")
- @GetMapping("/selectDevicePrincipal")
- public Result selectDevicePrincipal() {
- return Result.success(deviceService.selectDevicePrincipal());
- }
-
@ApiOperation(value = "閫氳繃椤圭洰鑾峰彇璁惧鍒楄〃")
@GetMapping("/selectDeviceByCategory")
public Result selectDeviceByCategory(String inspectionItem, String inspectionItemSubclass,String laboratory) {
diff --git a/cnas-device/src/main/java/com/ruoyi/device/mapper/DeviceMapper.java b/cnas-device/src/main/java/com/ruoyi/device/mapper/DeviceMapper.java
index 2f2c500..92a8b2d 100644
--- a/cnas-device/src/main/java/com/ruoyi/device/mapper/DeviceMapper.java
+++ b/cnas-device/src/main/java/com/ruoyi/device/mapper/DeviceMapper.java
@@ -29,9 +29,6 @@
//鑾峰彇鍥剧墖鏁版嵁
void selectDeviceImage(@Param(value = "name") String name ,@Param(value = "id") Integer id);
- //鏌ヨ璁惧璐熻矗浜�
- List<Device> selectDevicePrincipal();
-
IPage<DeviceDto> selectDeviceParameterPage(Page page, @Param("ew") QueryWrapper<DeviceDto> queryWrappers, @Param("laboratoryNameIsNull") Boolean laboratoryNameIsNull);
List<Map<String, Object>> getInspectionItemSubclass(@Param("id") Integer id);
diff --git a/cnas-device/src/main/java/com/ruoyi/device/service/DeviceService.java b/cnas-device/src/main/java/com/ruoyi/device/service/DeviceService.java
index b732701..72073e9 100644
--- a/cnas-device/src/main/java/com/ruoyi/device/service/DeviceService.java
+++ b/cnas-device/src/main/java/com/ruoyi/device/service/DeviceService.java
@@ -34,8 +34,6 @@
List<Device> search(Integer status, String deviceName, String specificationModel, String largeCategory);
- List<Device> selectDevicePrincipal();
-
List<Device> selectDeviceByCategory(String inspectionItem, String inspectionItemSubclass,String laboratory);
DeviceDto selectDeviceByCode(Integer id);
diff --git a/cnas-device/src/main/java/com/ruoyi/device/service/impl/DeviceServiceImpl.java b/cnas-device/src/main/java/com/ruoyi/device/service/impl/DeviceServiceImpl.java
index fdb5a55..99bbc0b 100644
--- a/cnas-device/src/main/java/com/ruoyi/device/service/impl/DeviceServiceImpl.java
+++ b/cnas-device/src/main/java/com/ruoyi/device/service/impl/DeviceServiceImpl.java
@@ -117,11 +117,6 @@
}
@Override
- public List<Device> selectDevicePrincipal() {
- return deviceMapper.selectDevicePrincipal();
- }
-
- @Override
public List<Device> selectDeviceByCategory(String inspectionItem, String inspectionItemSubclass, String laboratory) {
List<Integer> id;
diff --git a/cnas-device/src/main/resources/mapper/DeviceMapper.xml b/cnas-device/src/main/resources/mapper/DeviceMapper.xml
index 2d5c6c8..5b557f1 100644
--- a/cnas-device/src/main/resources/mapper/DeviceMapper.xml
+++ b/cnas-device/src/main/resources/mapper/DeviceMapper.xml
@@ -89,11 +89,6 @@
, #{createUser}
, #{createTime})
</select>
- <select id="selectDevicePrincipal" resultType="com.ruoyi.device.pojo.Device">
- select id,
- equipment_manager
- from device
- </select>
<select id="selectDeviceParameterPage" resultType="com.ruoyi.device.pojo.Device">
select * from(
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java
index b56f0b5..e15ec7f 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java
@@ -58,6 +58,9 @@
/** 绛惧悕鍦板潃 */
private String signatureUrl;
+ /** 涓汉鐓х墖鍦板潃 */
+ private String pictureUrl;
+
/** 鍗曚綅id */
private String company;
@@ -326,6 +329,16 @@
this.signatureUrl = signatureUrl;
}
+ public String getPictureUrl()
+ {
+ return pictureUrl;
+ }
+
+ public void setPictureUrl(String pictureUrl)
+ {
+ this.pictureUrl = pictureUrl;
+ }
+
public String getCompany()
{
return company;
diff --git a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
index 0b30ccc..755d0cc 100644
--- a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
@@ -25,6 +25,7 @@
<result property="remark" column="remark" />
<result property="nameEn" column="name_en" />
<result property="signatureUrl" column="signature_url" />
+ <result property="pictureUrl" column="picture_url" />
<result property="company" column="company" />
<association property="dept" javaType="SysDept" resultMap="deptResult" />
<collection property="roles" javaType="java.util.List" resultMap="RoleResult" />
@@ -204,6 +205,7 @@
<if test="remark != null">remark = #{remark},</if>
<if test="nameEn != null and nameEn != ''">name_en = #{nameEn},</if>
<if test="signatureUrl != null and signatureUrl != ''">signature_url = #{signatureUrl},</if>
+ <if test="pictureUrl != null and pictureUrl != ''">picture_url = #{pictureUrl},</if>
<if test="company != null and company != ''">company = #{company},</if>
update_time = sysdate()
</set>
--
Gitblit v1.9.3