[feat]

1、修改设备组管理相关问题②

dk-modules/sample/src/main/java/org/dromara/sample/manage/controller/DeviceProController.java

@@ -95,7 +95,7 @@ public class DeviceProController {
     @Operation(summary = "查询项目人员。", description = "查询项目人员")
     @GetMapping("/{proId}/user/page")
     public HttpResultResponse<PaginationData<DeviceProUserEntity>> pageProUser(@PathVariable Integer proId,
-                                                                               @RequestParam("searchValue") String searchValue,
+                                                                               @RequestParam(value = "searchValue",required = false) String searchValue,
                                                                                @RequestParam(name = "pageNum", defaultValue = "1") Long page,
                                                                                @RequestParam(name = "pageSize", defaultValue = "10") Long pageSize) {
         Page<DeviceProUserEntity> pageQuery = new Page<>(page, pageSize);
@@ -109,14 +109,6 @@ public class DeviceProController {
         return HttpResultResponse.success(deviceProService.deleteProUser(proUserId,proId));
     }
 
-    /**
-     * 设备绑定项目组
-     */
-    @Operation(summary = "设备绑定项目组", description = "设备绑定项目组")
-    @PostMapping("/bind")
-    public HttpResultResponse<Boolean> updateDevice(@RequestBody Dict dict) {
-        return HttpResultResponse.success(deviceProService.updateDevice(dict));
-    }
 
     /**
      * 开启配置
@@ -141,25 +133,20 @@ public class DeviceProController {
     }
 
     /**
-     * 根据人员获取项目组(feign调用接口)
+     * 根据人员获取项目组
      */
-    @GetMapping("/list/pro")
-    public HttpResultResponse<List<Integer>> listDeviceGroup(@RequestParam("userId") Long userId) {
-        log.info("----------------------------开始调用feign接口查询项目组----------------------------");
-        List<Integer> result = deviceProService.listDeviceGroup(userId);
-        log.info("----------------------------调用feign接口查询项目组结束----------------------------");
-        return HttpResultResponse.success(result);
-    }
+//    @GetMapping("/list/pro")
+//    public HttpResultResponse<List<Integer>> listDeviceGroup(@RequestParam("userId") Long userId) {
+//        List<Integer> result = deviceProService.listDeviceGroup(userId);
+//        return HttpResultResponse.success(result);
+//    }
 
     /**
-     * 根据人员获取当前人员所拥有的机场(feign调用接口)
+     * 根据人员获取项目组
      */
-    @GetMapping("/feign/device")
-    public List<String> listDevice(@RequestParam("userId") Long userId) {
-        log.info("----------------------------开始调用feign接口查询项目所属机场----------------------------");
-        List<String> result = deviceProService.listDevice(userId);
-        log.info("----------------------------调用feign接口查询项目组所属机场----------------------------");
-        return result;
+    @GetMapping("/list/user/pro")
+    public HttpResultResponse<List<DeviceProEntity>> listUserGroup() {
+        List<DeviceProEntity> result = deviceProService.listUserGroup();
+        return HttpResultResponse.success(result);
     }
-
 }

dk-modules/sample/src/main/java/org/dromara/sample/manage/model/dto/DeviceProDTO.java

@@ -48,10 +48,10 @@ public class DeviceProDTO {
     /**
      * 设备组编码
      */
-    private String bindCode;
+    private String bind_code;
 
     /**
      * 设备组名称
      */
-    private String proName;
+    private String pro_name;
 }

dk-modules/sample/src/main/java/org/dromara/sample/manage/service/IDeviceProService.java

@@ -53,4 +53,7 @@ public interface IDeviceProService {
     PaginationData<DeviceProUserEntity> pageProUser(String searchValue, Integer proId,Page<DeviceProUserEntity> pageQuery);
 
     Boolean deleteProUser(Long proUserId, Integer proId);
+
+    List<DeviceProEntity> listUserGroup();
+
 }

dk-modules/sample/src/main/java/org/dromara/sample/manage/service/impl/DeviceProServiceImpl.java

@@ -129,10 +129,6 @@ public class DeviceProServiceImpl implements IDeviceProService  {
     @Transactional(rollbackFor = Exception.class)
     public Boolean updateDeviceProUser(List<DeviceProUserEntity> userEntity,Integer proId) {
         try {
-            userEntity.forEach(deviceProUserEntity -> {
-                deviceProUserEntity.setNickName(LoginHelper.getLoginUser().getNickname());
-                deviceProUserEntity.setDeptName(LoginHelper.getDeptName());
-            });
             //添加新的项目组成员
             deviceProUserMapper.insert(userEntity);
             return true;
@@ -261,6 +257,24 @@ public class DeviceProServiceImpl implements IDeviceProService  {
         return deviceProUserMapper.delete(wrapper) > 0;
     }
 
+    @Override
+    public List<DeviceProEntity> listUserGroup() {
+        Long userId = LoginHelper.getUserId();
+        LambdaQueryWrapper<DeviceProUserEntity> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(DeviceProUserEntity::getUserId,userId);
+        List<DeviceProUserEntity> proUserEntityList = deviceProUserMapper.selectList(wrapper);
+        if (ObjectUtil.isNotEmpty(proUserEntityList)){
+            List<Integer> proIdList = proUserEntityList.stream().map(DeviceProUserEntity::getDeviceProId).distinct().toList();
+            LambdaQueryWrapper<DeviceProEntity> queryWrapper = new LambdaQueryWrapper<>();
+            queryWrapper.in(DeviceProEntity::getId, proIdList);
+            //查询是否启用的设备组
+            queryWrapper.eq(DeviceProEntity::getBindType,1);
+            return deviceProMapper.selectList(queryWrapper);
+        }
+
+        return ListUtil.empty();
+    }
+
     @Override
     public Boolean saveAndUpdate(DeviceProEntity entity) {
         boolean flag = true;

dk-modules/sample/src/main/resources/mapper/IDeviceProMapper.xml

@@ -56,23 +56,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         LEFT JOIN manage_device d ON dp.id = d.pro_id
         LEFT JOIN manage_device_pro_user dpu ON dp.id = dpu.device_pro_id
         <where>
-        <if test="condition.deviceSn != null and condition.deviceSn != ''">
-            and d.device_sn like concat(concat('%',#{condition.deviceSn}),'%')
+        <if test="condition.bind_code != null and condition.bind_code != ''">
+            and dp.bind_code like concat(concat('%',#{condition.bind_code}),'%')
         </if>
-        <if test="condition.deviceName != null and condition.deviceName != ''">
-            and d.device_name like concat(concat('%',#{condition.deviceName}),'%')
-        </if>
-        <if test="condition.nickname != null and condition.nickname != ''">
-            and dpu.nickname like concat(concat('%',#{condition.nickname}),'%')
-        </if>
-        <if test="condition.userId != null and condition.userId != ''">
-            and dpu.user_id = #{condition.userId}
-        </if>
-        <if test="condition.bindCode != null and condition.bindCode != ''">
-            and dp.bind_code like concat(concat('%',#{condition.bindCode}),'%')
-        </if>
-        <if test="condition.proName != null and condition.proName != ''">
-            and dp.pro_name like concat(concat('%',#{condition.proName}),'%')
+        <if test="condition.pro_name != null and condition.pro_name != ''">
+            and dp.pro_name like concat(concat('%',#{condition.pro_name}),'%')
         </if>
         </where>
     </select>

dk-modules/system/src/main/java/org/dromara/system/controller/system/SysUserController.java

@@ -64,6 +64,16 @@ public class SysUserController extends BaseController {
         return userService.selectPageUserList(user, pageQuery);
     }
 
+    /**
+     * 查询全部用户不分页
+     * @param user
+     * @return
+     */
+    @GetMapping("/all/list")
+    public R<List<SysUserVo>> allList(SysUserBo user) {
+        return R.ok(userService.allList(user));
+    }
+
     /**
      * 导出用户列表
      */

dk-modules/system/src/main/java/org/dromara/system/domain/vo/SysUserProVo.java

@@ -0,0 +1,99 @@
+package org.dromara.system.domain.vo;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import org.dromara.common.sensitive.annotation.Sensitive;
+import org.dromara.common.sensitive.core.SensitiveStrategy;
+import org.dromara.common.translation.annotation.Translation;
+import org.dromara.common.translation.constant.TransConstant;
+import org.dromara.system.domain.SysUser;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+
+/**
+ * 用户信息视图对象 sys_user
+ *
+ * @author Michelle.Chung
+ */
+@Data
+public class SysUserProVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 用户ID
+     */
+    private Long userId;
+
+    /**
+     * 租户ID
+     */
+    private String tenantId;
+
+    /**
+     * 部门ID
+     */
+    private Long deptId;
+
+    /**
+     * 用户账号
+     */
+    private String userName;
+
+    /**
+     * 用户昵称
+     */
+    private String nickName;
+
+    /**
+     * 用户类型（sys_user系统用户）
+     */
+    private String userType;
+
+
+    /**
+     * 手机号码
+     */
+    private String phonenumber;
+
+    /**
+     * 用户性别（0男 1女 2未知）
+     */
+    private String sex;
+
+
+    /**
+     * 帐号状态（0正常 1停用）
+     */
+    private String status;
+
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+
+    /**
+     * 部门名
+     */
+    private String deptName;
+
+
+    /**
+     * 平台名称
+     */
+    private String productName;
+
+}

dk-modules/system/src/main/java/org/dromara/system/mapper/SysUserMapper.java

@@ -9,6 +9,7 @@ import org.dromara.common.mybatis.annotation.DataColumn;
 import org.dromara.common.mybatis.annotation.DataPermission;
 import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
 import org.dromara.system.domain.SysUser;
+import org.dromara.system.domain.bo.SysUserBo;
 import org.dromara.system.domain.vo.SysUserExportVo;
 import org.dromara.system.domain.vo.SysUserVo;
 
@@ -92,4 +93,6 @@ public interface SysUserMapper extends BaseMapperPlus<SysUser, SysUserVo> {
     int updateById(@Param(Constants.ENTITY) SysUser user);
 
     List<SysUserVo> selectFlwByIds(@Param(Constants.WRAPPER) Wrapper<SysUser> queryWrapper);
+
+    List<SysUserVo> allList(@Param("param") SysUserBo user);
 }

dk-modules/system/src/main/java/org/dromara/system/service/ISysUserService.java

@@ -273,4 +273,6 @@ public interface ISysUserService {
     List<SysUserVo> assignUserSelect(Long deptId);
 
     List<SysUserVo> selectFlwByIds(List<Long> userIds, Long deptId);
+
+    List<SysUserVo> allList(SysUserBo user);
 }

dk-modules/system/src/main/java/org/dromara/system/service/impl/SysUserServiceImpl.java

@@ -584,6 +584,11 @@ public class SysUserServiceImpl implements ISysUserService {
             .in(CollUtil.isNotEmpty(userIds), SysUser::getUserId, userIds));
     }
 
+    @Override
+    public List<SysUserVo> allList(SysUserBo user) {
+        return baseMapper.allList(user);
+    }
+
     /**
      * 通过用户ID查询用户账户
      *

dk-modules/system/src/main/resources/mapper/system/SysUserMapper.xml

@@ -96,5 +96,21 @@
         ${ew.getCustomSqlSegment}
     </select>
 
+    <select id="allList" resultType="org.dromara.system.domain.vo.SysUserProVo">
+        select
+        u.user_id as userId, u.dept_id as deptId, u.nick_name as nickName, u.user_name as userName, u.email as email, u.phonenumber, u.sex,
+        u.status , u.create_by as createBy, u.create_time as createTime, u.remark,sd.dept_name deptName
+        from sys_user u left JOIN sys_dept sd on u.dept_id = sd.dept_id
+        <where>
+            u.del_flag = '0'
+            <if test="param.nickName != null and param.nickName != ''">
+                and u.nick_name like concat('%',#{param.nickName},'%')
+            </if>
+            <if test="param.userName != null and param.userName != ''">
+                and u.user_name like concat('%',#{param.userName},'%')
+            </if>
+        </where>
+    </select>
+
 
 </mapper>