修复sql

wisenergy-mapper/src/main/resources/mapper/UserDataMapper.xml

@@ -116,7 +116,7 @@
         select *
         from
         <include refid="table"/>
-        limit #{startNo},#{endNo}
+        where user_id > #{startNo} and #{endNo} >=user_id
     </select>
 
 </mapper>

wisenergy-mapper/src/main/resources/mapper/UsersMapper.xml

@@ -242,7 +242,7 @@ GROUP BY user_id
         select id as userId,rank,phone
         from
         <include refid="table"/>
-        limit #{startNo},#{endNo}
+        where id> #{startNo} and #{endNo} >=id
     </select>
 
     <select id="getUserData" resultType="cn.wisenergy.model.vo.UserVo">

wisenergy-service/src/main/java/cn/wisenergy/service/Manager/UserDataManger.java

@@ -29,18 +29,4 @@ public class UserDataManger {
         }
         return true;
     }
-
-
-    @Transactional(rollbackFor = Exception.class)
-    public boolean updateBatchUserData(List<UserData> list) {
-        if (!CollectionUtils.isEmpty(list)) {
-            for (UserData userData : list) {
-                int count = userDataMapper.edit(userData);
-                if (count == 0) {
-                    return false;
-                }
-            }
-        }
-        return true;
-    }
 }

wisenergy-service/src/main/java/cn/wisenergy/service/app/impl/BottomServiceImpl.java

@@ -35,7 +35,7 @@ public class BottomServiceImpl implements BottomService {
             usersId = 0L;
         }
         Integer startNo = Math.toIntExact(usersId) - 1;
-        Integer endNo = queryVo.getNumber();
+        Integer endNo = startNo + queryVo.getNumber();
         //获取所有用户数据
         List<UserData> list = userDataMapper.getBottom(startNo, endNo);
         if (!CollectionUtils.isEmpty(list)) {

wisenergy-service/src/main/java/cn/wisenergy/service/app/impl/UserDataServiceImpl.java

@@ -58,7 +58,7 @@ public class UserDataServiceImpl implements UserDataService {
             usersId = 0L;
         }
         Integer startNo = Math.toIntExact(usersId);
-        Integer endNo = queryVo.getNumber();
+        Integer endNo = startNo + queryVo.getNumber();
         //获取所有用户数据
         List<UserDto> userDtos = usersMapper.getAllUserData(startNo, endNo);
         if (CollectionUtils.isEmpty(userDtos)) {

wisenergy-web-admin/src/main/java/cn/wisenergy/web/admin/controller/app/TestUserController2.java

-package cn.wisenergy.web.admin.controller.app;
-
-import cn.wisenergy.common.utils.R;
-import cn.wisenergy.model.dto.UserSimpleInfoDto;
-import cn.wisenergy.model.dto.UsersInfoDto;
-import cn.wisenergy.service.app.TestUserService;
-import cn.wisenergy.web.common.BaseController;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiOperation;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.util.List;
-
-/**
- * @author ASUS
- */
-@Api(tags = "用户管理（Test）")
-@RestController
-@Slf4j
-public class TestUserController2 extends BaseController {
-
-    @Autowired
-    private TestUserService testUserService;
-
-    @ApiOperation(value = "获取下一级用户的信息", notes = "获取下一级用户的信息", httpMethod = "GET")
-    @ApiImplicitParam(name = "userId", value = "用户id", dataType = "int")
-    @GetMapping("/users/getDownUsersInfoById")
-    public R<List<UserSimpleInfoDto>> getDownUserInfoById(Long userId) {
-        log.info("TestUserController2[]getDownUsersInfoById[]input.param.userId:" + userId);
-        List<UserSimpleInfoDto> users = testUserService.getDownUserInfoById(userId);
-        return R.ok(users);
-    }
-
-    @ApiOperation(value = "获取用户详细信息", notes = "获取用户详细信息", httpMethod = "GET")
-    @ApiImplicitParam(name = "userId", value = "用户id", dataType = "int")
-    @GetMapping("/users/getUserInfoById")
-    public R<UsersInfoDto> getUserInfoById(Long userId) {
-        log.info("TestUserController2[]getUserInfoById[]input.param.userId:" + userId);
-        UsersInfoDto user = testUserService.getUserInfoById(userId);
-        return R.ok(user);
-    }
-
-
-
-}

wisenergy-web-admin/src/main/java/cn/wisenergy/web/admin/controller/app/UserDataController.java

@@ -25,7 +25,7 @@ public class UserDataController {
     @Resource
     private UserDataService userDataService;
 
-    @ApiOperation(value = "获取token接口", notes = "获取token接口", httpMethod = "POST")
+    @ApiOperation(value = "批量保存统计用户数据", notes = "批量保存统计用户数据", httpMethod = "POST")
     @ApiImplicitParam(name = "queryVo", value = "每次统计条数", dataType = "UserQueryVo")
     @PostMapping(value = "/user/saveBatchUserData")
     public R<Boolean> saveBatchUserData(@RequestBody UserQueryVo queryVo) {

wisenergy-web-admin/src/main/resources/application.yml

@@ -17,7 +17,7 @@ spring:
     allow-bean-definition-overriding: true
   # 环境 dev|test|prod
   profiles:
-    active: prod
+    active: dev
   # jackson时间格式化
   jackson:
     time-zone: GMT+8