半成本

src/main/java/com/zy/bms/controller/pc/AdminController.java

@@ -36,7 +36,7 @@ public class AdminController extends BaseController {
      */
     @PostMapping("login.do")
     public ServerResponse login(String username, String password) {
-        Admin admin = adminService.getByUsernameOrPhone(username);
+        Admin admin = adminService.getByUsername(username);
         if (admin == null) return ServerResponse.createByWarning("用户不存在");
         //MD5密码
         password = MD5Util.MD5Encode(password);

src/main/java/com/zy/bms/controller/pc/PcDeviceController.java

@@ -26,9 +26,9 @@ public class PcDeviceController {
     /**
      * 分页查询设备集合
      */
-    @PostMapping("getListPage.do")
+    @PostMapping("listPage.do")
     public ServerResponse getListPage(DeviceIO io) {
-        return ServerResponse.createBySuccess(deviceService.getListPage(io));
+        return ServerResponse.createBySuccess(deviceService.listPage(io));
     }
 
     /**

src/main/java/com/zy/bms/mapper/DeviceMapper.java

@@ -26,7 +26,7 @@ public interface DeviceMapper extends BaseMapper<Device> {
      * @param page 分页条件
      * @param io   查询条件
      */
-    IPage<DeviceFullDataVo> getListPage(IPage<DeviceFullDataVo> page, @Param("io") DeviceIO io);
+    IPage<DeviceFullDataVo> listPage(IPage<DeviceFullDataVo> page, @Param("io") DeviceIO io);
 
     /**
      * 更新设备名称

src/main/java/com/zy/bms/model/Admin.java

@@ -34,7 +34,6 @@ public class Admin {
      */
     private String password;
 
-
     /**
      * 创建时间
      */

src/main/java/com/zy/bms/service/AdminService.java

@@ -20,9 +20,9 @@ public class AdminService extends ServiceImpl<AdminMapper, Admin> {
      *
      * @param content 用户名 或 密码
      */
-    public Admin getByUsernameOrPhone(String content) {
+    public Admin getByUsername(String content) {
         QueryWrapper<Admin> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("username", content).or().eq("phone", content);
+        queryWrapper.eq("username", content);
         return baseMapper.selectOne(queryWrapper);
     }
 }

src/main/java/com/zy/bms/service/DeviceService.java

@@ -28,9 +28,9 @@ public class DeviceService extends ServiceImpl<DeviceMapper, Device> {
      *
      * @param io 查询条件
      */
-    public IPage<DeviceFullDataVo> getListPage(DeviceIO io) {
+    public IPage<DeviceFullDataVo> listPage(DeviceIO io) {
         Page<DeviceFullDataVo> page = new Page<>(io.getCurrent(), io.getSize());
-        return baseMapper.getListPage(page, io);
+        return baseMapper.listPage(page, io);
     }
 
     /**

src/main/java/com/zy/bms/service/MqttLogService.java

@@ -27,19 +27,19 @@ public class MqttLogService extends ServiceImpl<MqttLogMapper, MqttLog> {
      * @param tag     0收 1发
      */
     public void saveLog(String topic, String payload, Integer tag) {
-        MqttLog mqttLog = new MqttLog();
-        mqttLog.setTopic(topic);
+        MqttLog entity = new MqttLog();
+        entity.setTopic(topic);
         //mqtt 日志类型
-        mqttLog.setTag(tag);
+        entity.setTag(tag);
         //获取消息解析对象
         MqttMsgDto mqttMsgDto = MqttMsgDto.parse(payload);
         String regTopic = tag == 0 ? Constant.TOPIC_REGISTER_SERVER : Constant.TOPIC_REGISTER_CLIENT;
         //区分注册报文和普通报文,注册报文取设备随机码
-        mqttLog.setDeviceId(topic.equals(regTopic) ? mqttMsgDto.getString("regnum") : mqttMsgDto.getDeviceId());
+        entity.setDeviceId(topic.equals(regTopic) ? mqttMsgDto.getString("regnum") : mqttMsgDto.getDeviceId());
         //mqtt 指令
-        mqttLog.setInstruction(mqttMsgDto.getM());
-        mqttLog.setContent(payload);
-        baseMapper.insert(mqttLog);
+        entity.setInstruction(mqttMsgDto.getM());
+        entity.setContent(payload);
+        baseMapper.insert(entity);
     }
 
     /**

src/main/resources/application-dev.yml

@@ -1,5 +1,5 @@
 server:
-  port: 8080
+  port: 8081
 spring:
   redis:
     host: 59.110.141.39

src/main/resources/mapper/DeviceMapping.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.zy.bms.mapper.DeviceMapper">
 
-    <select id="getListPage" resultType="com.zy.bms.common.vo.DeviceFullDataVo">
+    <select id="listPage" resultType="com.zy.bms.common.vo.DeviceFullDataVo">
         SELECT
             t1.num             AS deviceNum,
             t1.password,