2023-05-11 17:23:36 完成设备管理的增、删、改、查接口!

psdc-business/src/main/java/com/psdc/entity/PsdcDevice.java

@@ -33,7 +33,7 @@ public class PsdcDevice {
   /** 安装地址 */
   private String deviceAddress ;
   /** 启用时间 */
-  private Date startTime ;
+  private String startTime ;
   /** 设备状态：1-未激活，2-禁用，3-在线，4-离线 */
   private Integer deviceStatus ;
   /** 图片地址 */

psdc-business/src/main/java/com/psdc/mapper/PsdcDeviceMapper.java

@@ -36,10 +36,9 @@ public interface PsdcDeviceMapper{
      * 分页查询指定行数据
      *
      * @param psdcDevice 查询条件
-     * @param pageable 分页对象
      * @return 对象列表
      */
-    List<PsdcDevice> queryAllByLimit(PsdcDevice psdcDevice, @Param("pageable") Pageable pageable);
+    List<PsdcDevice> queryAllByLimit(PsdcDevice psdcDevice);
     /** 
      * 统计总行数
      *
@@ -64,10 +63,10 @@ public interface PsdcDeviceMapper{
     /** 
      * 通过主键删除数据
      *
-     * @param deviceId 主键
+     * @param deviceIds 主键
      * @return 影响行数
      */
-    int deleteById(Integer deviceId);
+    int deleteById(@Param(value = "deviceIds") Long[] deviceIds);
 
      /**
       * 根据用户id查询设备

psdc-business/src/main/java/com/psdc/service/IPsdcDeviceService.java

@@ -38,7 +38,15 @@ public interface IPsdcDeviceService {
      * @param psdcDevice 实例对象
      * @return 实例对象
      */
-    PsdcDevice insert(PsdcDevice psdcDevice);
+    Integer insert(PsdcDevice psdcDevice);
+
+    /**
+     * 分页查询指定行数据
+     *
+     * @param psdcDevice 查询条件
+     * @return 对象列表
+     */
+    List<PsdcDevice> queryAllByLimit(PsdcDevice psdcDevice);
 
     /**
      * 更新数据
@@ -46,14 +54,14 @@ public interface IPsdcDeviceService {
      * @param psdcDevice 实例对象
      * @return 实例对象
      */
-    PsdcDevice update(PsdcDevice psdcDevice);
+    Integer update(PsdcDevice psdcDevice);
     /**
      * 通过主键删除数据
      *
-     * @param deviceId 主键
+     * @param deviceIds 主键
      * @return 是否成功
      */
-    boolean deleteById(Integer deviceId);
+    boolean deleteById(Long[] deviceIds);
 
     /**
      * 更新设备状态

psdc-business/src/main/java/com/psdc/service/impl/PsdcDeviceServiceImpl.java

@@ -70,9 +70,13 @@ public class PsdcDeviceServiceImpl implements IPsdcDeviceService{
      * @param psdcDevice 实例对象
      * @return 实例对象
      */
-    public PsdcDevice insert(PsdcDevice psdcDevice){
+    public Integer insert(PsdcDevice psdcDevice){
-        psdcDeviceMapper.insert(psdcDevice);
+        return psdcDeviceMapper.insert(psdcDevice);
-        return psdcDevice;
+    }
+
+    @Override
+    public List<PsdcDevice> queryAllByLimit(PsdcDevice psdcDevice) {
+        return psdcDeviceMapper.queryAllByLimit(psdcDevice);
     }
 
     /**
@@ -81,19 +85,18 @@ public class PsdcDeviceServiceImpl implements IPsdcDeviceService{
      * @param psdcDevice 实例对象
      * @return 实例对象
      */
-    public PsdcDevice update(PsdcDevice psdcDevice){
+    public Integer update(PsdcDevice psdcDevice){
-        psdcDeviceMapper.update(psdcDevice);
+        return psdcDeviceMapper.update(psdcDevice);
-        return queryById(psdcDevice.getDeviceId());
     }
 
     /**
      * 通过主键删除数据
      *
-     * @param deviceId 主键
+     * @param deviceIds 主键
      * @return 是否成功
      */
-    public boolean deleteById(Integer deviceId){
+    public boolean deleteById(Long[] deviceIds){
-        int total = psdcDeviceMapper.deleteById(deviceId);
+        int total = psdcDeviceMapper.deleteById(deviceIds);
         return total > 0;
     }
 

psdc-business/src/main/resources/mapper/business/PsdcDeviceMapper.xml

@@ -145,7 +145,6 @@
                 and update_time = #{updateTime}
             </if>
         </where>
-        limit #{pageable.offset}, #{pageable.pageSize}
     </select>
 
     <!--统计总行数-->
@@ -249,7 +248,7 @@
                 device_status = #{deviceStatus},
             </if>
             <if test="deviceRunstatus != null and deviceRunstatus != ''">
-                and device_runstatus = #{deviceRunstatus}
+                device_runstatus = #{deviceRunstatus},
             </if>
             <if test="photoUrl != null and photoUrl != ''">
                 photo_url = #{photoUrl},
@@ -263,7 +262,7 @@
             <if test="updateBy != null and updateBy != ''">
                 update_by = #{updateBy},
             </if>
-            <if test="updateTime != null and updateTime != ''">
+            <if test="updateTime != null ">
                 update_time = #{updateTime},
             </if>
         </set>
@@ -272,7 +271,10 @@
 
     <!--通过主键删除-->
     <delete id="deleteById">
-        delete from psdc_device where device_id = #{deviceId}
+        delete from psdc_device where device_id in
+        <foreach collection="deviceIds" open="(" close=")" separator="," item="id">
+            #{id}
+        </foreach>
     </delete>
 
 

psdc-system/src/main/java/com/psdc/mapper/SysUserMapper.java

@@ -19,7 +19,9 @@ public interface SysUserMapper
      * @param sysUser 用户信息
      * @return 用户信息集合信息
      */
-    public List<SysUser> selectUserList(SysUser sysUser);
+    List<SysUser> selectUserList(SysUser sysUser);
+
+    List<SysUser> selectUserList2();
 
     /**
      * 根据条件分页查询已配用户角色列表

psdc-system/src/main/java/com/psdc/service/impl/SysUserServiceImpl.java

@@ -4,6 +4,7 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
 import javax.validation.Validator;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -31,8 +32,7 @@ import com.psdc.service.ISysUserService;
  * @author
  */
 @Service
-public class SysUserServiceImpl implements ISysUserService
+public class SysUserServiceImpl implements ISysUserService {
-{
     private static final Logger log = LoggerFactory.getLogger(SysUserServiceImpl.class);
 
     @Autowired
@@ -57,8 +57,10 @@ public class SysUserServiceImpl implements ISysUserService
      * @return 用户信息集合信息
      */
     @Override
-    public List<SysUser> selectUserList(SysUser user)
+    public List<SysUser> selectUserList(SysUser user) {
-    {
+        if (null == user){
+            return userMapper.selectUserList2();
+        }
         return userMapper.selectUserList(user);
     }
 
@@ -69,8 +71,7 @@ public class SysUserServiceImpl implements ISysUserService
      * @return 用户信息集合信息
      */
     @Override
-    public List<SysUser> selectAllocatedList(SysUser user)
+    public List<SysUser> selectAllocatedList(SysUser user) {
-    {
         return userMapper.selectAllocatedList(user);
     }
 
@@ -81,8 +82,7 @@ public class SysUserServiceImpl implements ISysUserService
      * @return 用户信息集合信息
      */
     @Override
-    public List<SysUser> selectUnallocatedList(SysUser user)
+    public List<SysUser> selectUnallocatedList(SysUser user) {
-    {
         return userMapper.selectUnallocatedList(user);
     }
 
@@ -93,8 +93,7 @@ public class SysUserServiceImpl implements ISysUserService
      * @return 用户对象信息
      */
     @Override
-    public SysUser selectUserByUserName(String userName)
+    public SysUser selectUserByUserName(String userName) {
-    {
         return userMapper.selectUserByUserName(userName);
     }
 
@@ -105,8 +104,7 @@ public class SysUserServiceImpl implements ISysUserService
      * @return 用户对象信息
      */
     @Override
-    public SysUser selectUserById(Long userId)
+    public SysUser selectUserById(Long userId) {
-    {
         return userMapper.selectUserById(userId);
     }
 
@@ -117,11 +115,9 @@ public class SysUserServiceImpl implements ISysUserService
      * @return 结果
      */
     @Override
-    public String selectUserRoleGroup(String userName)
+    public String selectUserRoleGroup(String userName) {
-    {
         List<SysRole> list = roleMapper.selectRolesByUserName(userName);
-        if (CollectionUtils.isEmpty(list))
+        if (CollectionUtils.isEmpty(list)) {
-        {
             return StringUtils.EMPTY;
         }
         return list.stream().map(SysRole::getRoleName).collect(Collectors.joining(","));
@@ -135,12 +131,10 @@ public class SysUserServiceImpl implements ISysUserService
      * @return 结果
      */
     @Override
-    public boolean checkUserNameUnique(SysUser user)
+    public boolean checkUserNameUnique(SysUser user) {
-    {
         Long userId = StringUtils.isNull(user.getUserId()) ? -1L : user.getUserId();
         SysUser info = userMapper.checkUserNameUnique(user.getUserName());
-        if (StringUtils.isNotNull(info) && info.getUserId().longValue() != userId.longValue())
+        if (StringUtils.isNotNull(info) && info.getUserId().longValue() != userId.longValue()) {
-        {
             return UserConstants.NOT_UNIQUE;
         }
         return UserConstants.UNIQUE;
@@ -153,12 +147,10 @@ public class SysUserServiceImpl implements ISysUserService
      * @return
      */
     @Override
-    public boolean checkPhoneUnique(SysUser user)
+    public boolean checkPhoneUnique(SysUser user) {
-    {
         Long userId = StringUtils.isNull(user.getUserId()) ? -1L : user.getUserId();
         SysUser info = userMapper.checkPhoneUnique(user.getPhonenumber());
-        if (StringUtils.isNotNull(info) && info.getUserId().longValue() != userId.longValue())
+        if (StringUtils.isNotNull(info) && info.getUserId().longValue() != userId.longValue()) {
-        {
             return UserConstants.NOT_UNIQUE;
         }
         return UserConstants.UNIQUE;
@@ -171,12 +163,10 @@ public class SysUserServiceImpl implements ISysUserService
      * @return
      */
     @Override
-    public boolean checkEmailUnique(SysUser user)
+    public boolean checkEmailUnique(SysUser user) {
-    {
         Long userId = StringUtils.isNull(user.getUserId()) ? -1L : user.getUserId();
         SysUser info = userMapper.checkEmailUnique(user.getEmail());
-        if (StringUtils.isNotNull(info) && info.getUserId().longValue() != userId.longValue())
+        if (StringUtils.isNotNull(info) && info.getUserId().longValue() != userId.longValue()) {
-        {
             return UserConstants.NOT_UNIQUE;
         }
         return UserConstants.UNIQUE;
@@ -188,10 +178,8 @@ public class SysUserServiceImpl implements ISysUserService
      * @param user 用户信息
      */
     @Override
-    public void checkUserAllowed(SysUser user)
+    public void checkUserAllowed(SysUser user) {
-    {
+        if (StringUtils.isNotNull(user.getUserId()) && user.isAdmin()) {
-        if (StringUtils.isNotNull(user.getUserId()) && user.isAdmin())
-        {
             throw new ServiceException("不允许操作超级管理员用户");
         }
     }
@@ -202,15 +190,12 @@ public class SysUserServiceImpl implements ISysUserService
      * @param userId 用户id
      */
     @Override
-    public void checkUserDataScope(Long userId)
+    public void checkUserDataScope(Long userId) {
-    {
+        if (!SysUser.isAdmin(SecurityUtils.getUserId())) {
-        if (!SysUser.isAdmin(SecurityUtils.getUserId()))
-        {
             SysUser user = new SysUser();
             user.setUserId(userId);
             List<SysUser> users = SpringUtils.getAopProxy(this).selectUserList(user);
-            if (StringUtils.isEmpty(users))
+            if (StringUtils.isEmpty(users)) {
-            {
                 throw new ServiceException("没有权限访问用户数据！");
             }
         }
@@ -224,8 +209,7 @@ public class SysUserServiceImpl implements ISysUserService
      */
     @Override
     @Transactional
-    public int insertUser(SysUser user)
+    public int insertUser(SysUser user) {
-    {
         // 新增用户信息
         int rows = userMapper.insertUser(user);
         // 新增用户与角色管理
@@ -240,8 +224,7 @@ public class SysUserServiceImpl implements ISysUserService
      * @return 结果
      */
     @Override
-    public boolean registerUser(SysUser user)
+    public boolean registerUser(SysUser user) {
-    {
         return userMapper.insertUser(user) > 0;
     }
 
@@ -253,8 +236,7 @@ public class SysUserServiceImpl implements ISysUserService
      */
     @Override
     @Transactional
-    public int updateUser(SysUser user)
+    public int updateUser(SysUser user) {
-    {
         Long userId = user.getUserId();
         // 删除用户与角色关联
         userRoleMapper.deleteUserRoleByUserId(userId);
@@ -271,8 +253,7 @@ public class SysUserServiceImpl implements ISysUserService
      */
     @Override
     @Transactional
-    public void insertUserAuth(Long userId, Long[] roleIds)
+    public void insertUserAuth(Long userId, Long[] roleIds) {
-    {
         userRoleMapper.deleteUserRoleByUserId(userId);
         insertUserRole(userId, roleIds);
     }
@@ -284,8 +265,7 @@ public class SysUserServiceImpl implements ISysUserService
      * @return 结果
      */
     @Override
-    public int updateUserStatus(SysUser user)
+    public int updateUserStatus(SysUser user) {
-    {
         return userMapper.updateUser(user);
     }
 
@@ -296,8 +276,7 @@ public class SysUserServiceImpl implements ISysUserService
      * @return 结果
      */
     @Override
-    public int updateUserProfile(SysUser user)
+    public int updateUserProfile(SysUser user) {
-    {
         return userMapper.updateUser(user);
     }
 
@@ -309,8 +288,7 @@ public class SysUserServiceImpl implements ISysUserService
      * @return 结果
      */
     @Override
-    public boolean updateUserAvatar(String userName, String avatar)
+    public boolean updateUserAvatar(String userName, String avatar) {
-    {
         return userMapper.updateUserAvatar(userName, avatar) > 0;
     }
 
@@ -321,8 +299,7 @@ public class SysUserServiceImpl implements ISysUserService
      * @return 结果
      */
     @Override
-    public int resetPwd(SysUser user)
+    public int resetPwd(SysUser user) {
-    {
         return userMapper.updateUser(user);
     }
 
@@ -334,8 +311,7 @@ public class SysUserServiceImpl implements ISysUserService
      * @return 结果
      */
     @Override
-    public int resetUserPwd(String userName, String password)
+    public int resetUserPwd(String userName, String password) {
-    {
         return userMapper.resetUserPwd(userName, password);
     }
 
@@ -344,8 +320,7 @@ public class SysUserServiceImpl implements ISysUserService
      *
      * @param user 用户对象
      */
-    public void insertUserRole(SysUser user)
+    public void insertUserRole(SysUser user) {
-    {
         this.insertUserRole(user.getUserId(), user.getRoleIds());
     }
 
@@ -356,14 +331,11 @@ public class SysUserServiceImpl implements ISysUserService
      * @param userId  用户ID
      * @param roleIds 角色组
      */
-    public void insertUserRole(Long userId, Long[] roleIds)
+    public void insertUserRole(Long userId, Long[] roleIds) {
-    {
+        if (StringUtils.isNotEmpty(roleIds)) {
-        if (StringUtils.isNotEmpty(roleIds))
-        {
             // 新增用户与角色管理
             List<SysUserRole> list = new ArrayList<SysUserRole>(roleIds.length);
-            for (Long roleId : roleIds)
+            for (Long roleId : roleIds) {
-            {
                 SysUserRole ur = new SysUserRole();
                 ur.setUserId(userId);
                 ur.setRoleId(roleId);
@@ -381,8 +353,7 @@ public class SysUserServiceImpl implements ISysUserService
      */
     @Override
     @Transactional
-    public int deleteUserById(Long userId)
+    public int deleteUserById(Long userId) {
-    {
         // 删除用户与角色关联
         userRoleMapper.deleteUserRoleByUserId(userId);
         return userMapper.deleteUserById(userId);
@@ -396,10 +367,8 @@ public class SysUserServiceImpl implements ISysUserService
      */
     @Override
     @Transactional
-    public int deleteUserByIds(Long[] userIds)
+    public int deleteUserByIds(Long[] userIds) {
-    {
+        for (Long userId : userIds) {
-        for (Long userId : userIds)
-        {
             checkUserAllowed(new SysUser(userId));
             checkUserDataScope(userId);
         }
@@ -417,10 +386,8 @@ public class SysUserServiceImpl implements ISysUserService
      * @return 结果
      */
     @Override
-    public String importUser(List<SysUser> userList, Boolean isUpdateSupport, String operName)
+    public String importUser(List<SysUser> userList, Boolean isUpdateSupport, String operName) {
-    {
+        if (StringUtils.isNull(userList) || userList.size() == 0) {
-        if (StringUtils.isNull(userList) || userList.size() == 0)
-        {
             throw new ServiceException("导入用户数据不能为空！");
         }
         int successNum = 0;
@@ -428,23 +395,18 @@ public class SysUserServiceImpl implements ISysUserService
         StringBuilder successMsg = new StringBuilder();
         StringBuilder failureMsg = new StringBuilder();
         String password = configService.selectConfigByKey("sys.user.initPassword");
-        for (SysUser user : userList)
+        for (SysUser user : userList) {
-        {
+            try {
-            try
-            {
                 // 验证是否存在这个用户
                 SysUser u = userMapper.selectUserByUserName(user.getUserName());
-                if (StringUtils.isNull(u))
+                if (StringUtils.isNull(u)) {
-                {
                     BeanValidators.validateWithException(validator, user);
                     user.setPassword(SecurityUtils.encryptPassword(password));
                     user.setCreateBy(operName);
                     this.insertUser(user);
                     successNum++;
                     successMsg.append("<br/>" + successNum + "、账号 " + user.getUserName() + " 导入成功");
-                }
+                } else if (isUpdateSupport) {
-                else if (isUpdateSupport)
-                {
                     BeanValidators.validateWithException(validator, user);
                     checkUserAllowed(user);
                     checkUserDataScope(user.getUserId());
@@ -452,28 +414,21 @@ public class SysUserServiceImpl implements ISysUserService
                     this.updateUser(user);
                     successNum++;
                     successMsg.append("<br/>" + successNum + "、账号 " + user.getUserName() + " 更新成功");
-                }
+                } else {
-                else
-                {
                     failureNum++;
                     failureMsg.append("<br/>" + failureNum + "、账号 " + user.getUserName() + " 已存在");
                 }
-            }
+            } catch (Exception e) {
-            catch (Exception e)
-            {
                 failureNum++;
                 String msg = "<br/>" + failureNum + "、账号 " + user.getUserName() + " 导入失败：";
                 failureMsg.append(msg + e.getMessage());
                 log.error(msg, e);
             }
         }
-        if (failureNum > 0)
+        if (failureNum > 0) {
-        {
             failureMsg.insert(0, "很抱歉，导入失败！共 " + failureNum + " 条数据格式不正确，错误如下：");
             throw new ServiceException(failureMsg.toString());
-        }
+        } else {
-        else
-        {
             successMsg.insert(0, "恭喜您，数据已全部导入成功！共 " + successNum + " 条，数据如下：");
         }
         return successMsg.toString();

psdc-system/src/main/resources/mapper/system/SysUserMapper.xml

@@ -65,6 +65,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		</if>
 	</select>
 
+	<select id="selectUserList2" resultMap="SysUserResult">
+		Select user_id,  nick_name, user_name, email, avatar, phonenumber, sex, status,
+		       del_flag, login_ip, login_date, create_by, create_time, remark
+		From sys_user
+		Where del_flag != '2'
+	</select>
+	
 	<select id="selectAllocatedList" parameterType="SysUser" resultMap="SysUserResult">
 	    Select distinct u.user_id, u.user_name, u.nick_name, u.email, u.phonenumber, u.status, u.create_time
 	    From sys_user u

psdc-web/src/main/java/com/psdc/controller/manager/PsdcDeviceController.java

@@ -0,0 +1,96 @@
+package com.psdc.controller.manager;
+
+import com.alibaba.fastjson2.JSON;
+import com.alibaba.fastjson2.JSONObject;
+import com.github.pagehelper.page.PageMethod;
+import com.psdc.annotation.Log;
+import com.psdc.core.controller.BaseController;
+import com.psdc.core.domain.AjaxResult;
+import com.psdc.core.domain.entity.SysUser;
+import com.psdc.core.page.TableDataInfo;
+import com.psdc.entity.PsdcControlLog;
+import com.psdc.entity.PsdcDevice;
+import com.psdc.enums.BusinessType;
+import com.psdc.service.IPsdcDeviceService;
+import com.psdc.service.ISysUserService;
+import com.psdc.utils.SecurityUtils;
+import org.apache.commons.lang3.ArrayUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.*;
+
+/**
+ * @Author：戴仕崑
+ * @Project：psdc
+ * @Filename：PsdcDeviceController
+ * @Date：2023/5/11 15:13
+ * @Version 1.0
+ */
+@RestController
+@RequestMapping("/manager/device")
+public class PsdcDeviceController extends BaseController {
+
+    @Autowired
+    IPsdcDeviceService psdcDeviceService;
+
+    @Autowired
+    ISysUserService sysUserService;
+
+
+    @PreAuthorize("@ss.hasPermi('manager:device:list')")
+    @Log(title = "设备管理", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@Validated @RequestBody PsdcDevice pd) {
+        long userId = SecurityUtils.getUserId();
+        pd.setCreateBy(sysUserService.selectUserById(userId).getUserName());
+        pd.setCreateTime(new Date());
+        return toAjax(psdcDeviceService.insert(pd));
+    }
+
+
+    @PreAuthorize("@ss.hasPermi('manager:device:list')")
+    @Log(title = "设备管理", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@Validated @RequestBody PsdcDevice pd) {
+        long userId = SecurityUtils.getUserId();
+        pd.setUpdateBy(sysUserService.selectUserById(userId).getUserName());
+        pd.setUpdateTime(new Date());
+        return toAjax(psdcDeviceService.update(pd));
+    }
+
+    @PreAuthorize("@ss.hasPermi('manager:device:list')")
+    @Log(title = "设备管理", businessType = BusinessType.DELETE)
+    @DeleteMapping
+    public AjaxResult remove(@Validated @RequestBody Long[] deviceIds) {
+        return toAjax(psdcDeviceService.deleteById(deviceIds));
+    }
+
+
+    @PreAuthorize("@ss.hasPermi('manager:device:list')")
+    @RequestMapping(value = "/selusers", method = RequestMethod.GET)
+    public AjaxResult selAllUsers()  {
+        List<Map> maps = new ArrayList<>();
+        List<SysUser> list = sysUserService.selectUserList(null);
+        for (SysUser dd : list){
+            Map<String, Object> map = new HashMap<>();
+            map.put("label", dd.getUserName());
+            map.put("value", dd.getUserId());
+            maps.add(map);
+        }
+        return AjaxResult.success("用户下来列表", maps);
+    }
+
+    @PreAuthorize("@ss.hasPermi('manager:device:list')")
+    @PostMapping("/devicesList")
+    public TableDataInfo controlLogList(@RequestBody JSONObject jsonObject) {
+    // PageMethod.startPage(jsonObject.getInteger("pageNum"),jsonObject.getInteger("pageSize"));
+    // PsdcDevice deviceVo = JSON.parseObject(String.valueOf(jsonObject), PsdcDevice.class);
+        PsdcDevice deviceVo = myPage(jsonObject, PsdcDevice.class);
+        List<PsdcDevice> list = psdcDeviceService.queryAllByLimit(deviceVo);
+        return getDataTable(list);
+    }
+
+}