feat【资源库-数据产权子系统】增加用户列表查询接口

microservices-modules/microservices-modules-dms/src/main/java/com/microservices/dms/achievementLibrary/controller/BlockChainController.java

@@ -7,6 +7,7 @@ import com.microservices.dms.achievementLibrary.domain.BlockchainListQueryVo;
 import com.microservices.dms.achievementLibrary.domain.TokenListVo;
 import com.microservices.dms.achievementLibrary.domain.blockchain.InBlockchainData;
 import com.microservices.dms.achievementLibrary.domain.blockchain.InLinkProjectVo;
+import com.microservices.dms.achievementLibrary.domain.blockchain.UserVo;
 import com.microservices.dms.achievementLibrary.service.BlockChainService;
 import com.microservices.dms.achievementLibrary.service.InBlockchainDataServiceImpl;
 import io.swagger.annotations.Api;
@@ -78,6 +79,15 @@ public class BlockChainController extends BaseController {
         return getDataTable(list);
     }
 
+
+    @GetMapping("/userList")
+    @ApiOperation(value = "用户列表列表")
+    public TableDataInfo userList(UserVo userVo) {
+        startPage();
+        List<UserVo> list = blockChainService.userList(userVo);
+        return getDataTable(list);
+    }
+
     @GetMapping("/InBlockchainDataList")
     @ApiOperation(value = "查询区块链数据入链列表")
     public TableDataInfo list(InBlockchainData inBlockchainData) {

microservices-modules/microservices-modules-dms/src/main/java/com/microservices/dms/achievementLibrary/domain/blockchain/UserVo.java

@@ -0,0 +1,22 @@
+package com.microservices.dms.achievementLibrary.domain.blockchain;
+
+public class UserVo {
+    private Long id;
+    private String nickname;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getNickname() {
+        return nickname;
+    }
+
+    public void setNickname(String nickname) {
+        this.nickname = nickname;
+    }
+}

microservices-modules/microservices-modules-dms/src/main/java/com/microservices/dms/achievementLibrary/mapper/UserProjectTransferRecordsMapper.java

@@ -6,6 +6,7 @@ import java.util.Map;
 import com.microservices.common.datasource.annotation.Slave;
 import com.microservices.dms.achievementLibrary.domain.BlockchainListQueryVo;
 import com.microservices.dms.achievementLibrary.domain.blockchain.UserProjectTransferRecords;
+import com.microservices.dms.achievementLibrary.domain.blockchain.UserVo;
 import org.apache.ibatis.annotations.Mapper;
 
 /**
@@ -67,4 +68,6 @@ public interface UserProjectTransferRecordsMapper
     public int deleteUserProjectTransferRecordsByIds(Long[] ids);
 
     List<Map> userDataList(BlockchainListQueryVo queryVo);
+
+    List<UserVo> userList(UserVo userVo);
 }

microservices-modules/microservices-modules-dms/src/main/java/com/microservices/dms/achievementLibrary/service/BlockChainService.java

@@ -11,6 +11,7 @@ import com.microservices.dms.achievementLibrary.domain.TokenListVo;
 import com.microservices.dms.achievementLibrary.domain.blockchain.InBlockchainData;
 import com.microservices.dms.achievementLibrary.domain.blockchain.InLinkProjectVo;
 import com.microservices.dms.achievementLibrary.domain.blockchain.UserProjectTransferRecords;
+import com.microservices.dms.achievementLibrary.domain.blockchain.UserVo;
 import com.microservices.dms.achievementLibrary.mapper.InBlockchainDataMapper;
 import com.microservices.dms.achievementLibrary.mapper.UserProjectTransferRecordsMapper;
 import com.microservices.dms.common.vo.*;
@@ -172,7 +173,7 @@ public class BlockChainService {
                 records.setCreateTime(DateUtils.getNowDate());
                 records.setCreateBy(SecurityUtils.getUsername());
                 userProjectTransferRecordsMapper.insertUserProjectTransferRecords(records);
-                return AjaxResult.success(rsp.getString("message"), txHash);
+                return AjaxResult.success(rsp);
             }
         }
         return AjaxResult.error();
@@ -180,7 +181,7 @@ public class BlockChainService {
 
     private void validTokenCount(String tokenName, Long amount) {
         TokenListVo v = new TokenListVo();
-        v.setId(Long.parseLong(tokenName));
+        v.setId(Long.parseLong(Optional.ofNullable(tokenName).orElse("-1")));
         Long c = queryTotalToken(v);
         if (c < amount) {
             throw new ServiceException("token数量不足");
@@ -205,7 +206,7 @@ public class BlockChainService {
                 inBlockchainData.setCreateTime(DateUtils.getNowDate());
                 inBlockchainData.setCreateBy(SecurityUtils.getUsername());
                 inBlockchainDataMapper.insertInBlockchainData(inBlockchainData);
-                return AjaxResult.success(rsp.getString("message"), txHash);
+                return AjaxResult.success(rsp);
             }
         }
         return AjaxResult.error();
@@ -230,7 +231,7 @@ public class BlockChainService {
                 inBlockchainData.setCreateTime(DateUtils.getNowDate());
                 inBlockchainData.setCreateBy(SecurityUtils.getUsername());
                 inBlockchainDataMapper.insertInBlockchainData(inBlockchainData);
-                return AjaxResult.success(rsp.getString("message"), txHash);
+                return AjaxResult.success(rsp);
             }
         }
         return AjaxResult.error();
@@ -255,7 +256,7 @@ public class BlockChainService {
                 inBlockchainData.setCreateTime(DateUtils.getNowDate());
                 inBlockchainData.setCreateBy(SecurityUtils.getUsername());
                 inBlockchainDataMapper.insertInBlockchainData(inBlockchainData);
-                return AjaxResult.success(rsp.getString("message"), txHash);
+                return AjaxResult.success(rsp);
             }
         }
         return AjaxResult.error();
@@ -281,4 +282,8 @@ public class BlockChainService {
         }
         return userProjectTransferRecordsMapper.userDataList(queryVo);
     }
+
+    public List<UserVo> userList(UserVo userVo) {
+        return userProjectTransferRecordsMapper.userList(userVo);
+    }
 }

microservices-modules/microservices-modules-dms/src/main/resources/mapper/dms/UserProjectTransferRecordsMapper.xml

@@ -70,6 +70,16 @@
         </where>
     </select>
 
+    <select id="userList" resultType="com.microservices.dms.achievementLibrary.domain.blockchain.UserVo">
+        select * from (select id,IFNULL(nickname,login) as "nickname" from users where status=1) tmp
+        <where>
+
+            <if test="nickname != null  and nickname != ''">
+               and tmp.nickname like concat('%', #{nickname}, '%'))
+            </if>
+        </where>
+    </select>
+
     <insert id="insertUserProjectTransferRecords" parameterType="UserProjectTransferRecords" useGeneratedKeys="true"
             keyProperty="id">
         insert into user_project_transfer_records