diff --git a/wisenergy-mapper/src/main/resources/mapper/UsersMapper.xml b/wisenergy-mapper/src/main/resources/mapper/UsersMapper.xml index 1dde648fec921829bc53b9de566115d2e08d5da5..64f7f19985453d2f838c9d2e199c7ea23407f823 100644 --- a/wisenergy-mapper/src/main/resources/mapper/UsersMapper.xml +++ b/wisenergy-mapper/src/main/resources/mapper/UsersMapper.xml @@ -142,12 +142,12 @@ </select> <!--查询全部--> - <select id="findAll" resultType="User"> + <select id="findAll" resultType="cn.wisenergy.model.app.User"> select * from User </select> <!--查询用户--> - <select id="findByName" resultType="User"> + <select id="findByName" resultType="cn.wisenergy.model.app.User"> select * from User where user_id = #{userId} </select> diff --git a/wisenergy-service/src/main/java/cn/wisenergy/service/app/impl/UserService.java b/wisenergy-service/src/main/java/cn/wisenergy/service/app/impl/UserService.java index fdd5dddab4ad1ffdf89d77d93499071ab38fdfaa..b791255fab6c69c1956253ad9f12b00864a5e3aa 100644 --- a/wisenergy-service/src/main/java/cn/wisenergy/service/app/impl/UserService.java +++ b/wisenergy-service/src/main/java/cn/wisenergy/service/app/impl/UserService.java @@ -1,13 +1,12 @@ package cn.wisenergy.service.app.impl; -import cn.wisenergy.common.utils.R; import cn.wisenergy.mapper.UsersMapper; import cn.wisenergy.model.app.User; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import java.util.List; + /** * @ Description: 用户接å£å®žçް diff --git a/wisenergy-web-admin/src/main/java/cn/wisenergy/controller/UserController.java b/wisenergy-web-admin/src/main/java/cn/wisenergy/controller/UserSysController.java similarity index 95% rename from wisenergy-web-admin/src/main/java/cn/wisenergy/controller/UserController.java rename to wisenergy-web-admin/src/main/java/cn/wisenergy/controller/UserSysController.java index 97ee0b86b81d9c715b6b7e36e9d852bbf0c01069..27315c3f42ec6c2469281254a4044960dd61700c 100644 --- a/wisenergy-web-admin/src/main/java/cn/wisenergy/controller/UserController.java +++ b/wisenergy-web-admin/src/main/java/cn/wisenergy/controller/UserSysController.java @@ -10,10 +10,9 @@ import springfox.documentation.swagger2.annotations.EnableSwagger2; /** * Created by m1991 on 2021/2/23 15:45 */ -@EnableSwagger2 @RestController @RequestMapping("/sys") -public class UserController { +public class UserSysController { @Autowired UserService userService;