半成本

src/main/java/com/zy/bms/common/io/pc/AdminIO.java

@@ -1,26 +0,0 @@
-package com.zy.bms.common.io.pc;
-
-import com.zy.bms.common.io.PageIO;
-import lombok.Data;
-
-/**
- * PC 用户查询IO
- *
- * @author yang xiao kun
- * create on 2021/5/18
- */
-@Data
-public class AdminIO extends PageIO {
-    /**
-     * 用户名或手机号或昵称
-     */
-    private String key;
-    /**
-     * 状态
-     */
-    private Integer status;
-    /**
-     * 角色
-     */
-    private Integer role;
-}

src/main/java/com/zy/bms/common/io/pc/DeviceIO.java

@@ -19,13 +19,4 @@ public class DeviceIO extends PageIO {
      * 设备状态
      */
     private Integer status;
-    /**
-     * 项目组
-     */
-    private Integer group;
-
-    /**
-     * 项目
-     */
-    private Integer item;
 }

src/main/java/com/zy/bms/common/io/pc/GroupIO.java

@@ -1,22 +0,0 @@
-package com.zy.bms.common.io.pc;
-
-import com.zy.bms.common.io.PageIO;
-import lombok.Data;
-
-/**
- * 项目组 入参
- *
- * @author yang xiao kun
- * create on 2021/5/19
- */
-@Data
-public class GroupIO extends PageIO {
-    /**
-     * 项目组名/项目组编号
-     */
-    private String key;
-    /**
-     * 状态
-     */
-    private Integer status;
-}

src/main/java/com/zy/bms/common/io/pc/ItemIO.java

@@ -1,22 +0,0 @@
-package com.zy.bms.common.io.pc;
-
-import com.zy.bms.common.io.PageIO;
-import lombok.Data;
-
-/**
- * 项目 入参
- *
- * @author yang xiao kun
- * create on 2021/5/19
- */
-@Data
-public class ItemIO extends PageIO {
-    /**
-     * 项目名/项目编号
-     */
-    private String key;
-    /**
-     * 状态
-     */
-    private Integer status;
-}

src/main/java/com/zy/bms/common/io/pc/RoleIO.java

@@ -1,18 +0,0 @@
-package com.zy.bms.common.io.pc;
-
-import com.zy.bms.common.io.PageIO;
-import lombok.Data;
-
-/**
- * PC 角色查询IO
- *
- * @author yang xiao kun
- * create on 2021/5/18
- */
-@Data
-public class RoleIO extends PageIO {
-    /**
-     * 角色名
-     */
-    private String name;
-}

src/main/java/com/zy/bms/common/io/wechat/AnswerSetIO.java

@@ -1,19 +0,0 @@
-package com.zy.bms.common.io.wechat;
-
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * 自动接听
- *
- * @author yang xiao kun
- * create on 2021/1/21
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-public class AnswerSetIO extends SimpleSetIO {
-    /**
-     * 0关闭，1打开
-     */
-    private Integer autoAnswer;
-}

src/main/java/com/zy/bms/common/io/wechat/ContinueSetIO.java

@@ -1,21 +0,0 @@
-package com.zy.bms.common.io.wechat;
-
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * 持续定位IO
- *
- * @author yang xiao kun
- * create on 2021/1/21
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-public class ContinueSetIO extends SimpleSetIO {
-    /**
-     * 1:代表打开连续定位 0:代表关闭连续定位
-     * 设备在做后一次收到开启连续定位起计时5分钟后自动关闭连续定位。
-     * 如果希望持续开启连续定位，需要间隔小于5分钟重复发送开 启。收到关闭连续定位后设备会马上关闭连续定位
-     */
-    private Integer highFreq;
-}

src/main/java/com/zy/bms/common/io/wechat/GpsRateSetIO.java

@@ -1,19 +0,0 @@
-package com.zy.bms.common.io.wechat;
-
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * 定位频率设置
- *
- * @author yang xiao kun
- * create on 2021/1/21
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-public class GpsRateSetIO extends SimpleSetIO {
-    /**
-     * 单位 小时
-     */
-    private Integer gpsRate;
-}

src/main/java/com/zy/bms/common/io/wechat/NewsSetIO.java

@@ -1,32 +0,0 @@
-package com.zy.bms.common.io.wechat;
-
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * 语音播报设置
- *
- * @author yang xiao kun
- * create on 2021/1/21
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-public class NewsSetIO extends SimpleSetIO {
-
-    /**
-     * 星期几的几点几分播报，星期之间逗号间隔，星期与时间空格间隔
-     * 1,2,3,4,5 13:13
-     */
-    private String newsTime;
-
-    /**
-     * 播报类型，1:实时播报，0:固定时间播报
-     */
-    private Integer newsType;
-
-    /**
-     * 服务器下发文字
-     */
-    private String news;
-
-}

src/main/java/com/zy/bms/common/io/wechat/SetIO.java

@@ -0,0 +1,90 @@
+package com.zy.bms.common.io.wechat;
+
+import lombok.Data;
+
+/**
+ * 设置入参
+ *
+ * @author chen_yi
+ * Create on 2021/5/27
+ */
+@Data
+public class SetIO extends SimpleSetIO {
+
+    /**
+     * 1:代表打开连续定位 0:代表关闭连续定位
+     * 设备在做后一次收到开启连续定位起计时5分钟后自动关闭连续定位。
+     * 如果希望持续开启连续定位，需要间隔小于5分钟重复发送开 启。收到关闭连续定位后设备会马上关闭连续定位
+     */
+    private Integer highFreq;
+
+    /**
+     * 自动接听
+     * 0关闭，1打开
+     */
+    private Integer autoAnswer;
+
+    /**
+     * 定位频率
+     * 单位 小时
+     */
+    private Integer gpsRate;
+
+    /**
+     * 铃声音量
+     */
+    private Integer ringVol;
+
+    /**
+     * 系统音量
+     */
+    private Integer msgVol;
+
+    /**
+     * 通话音量
+     */
+    private Integer phoneVol;
+
+    /**
+     * 姓名
+     */
+    private String key0Name;
+    /**
+     * 电话号码
+     */
+    private String key0Phone;
+
+    /**
+     * 姓名
+     */
+    private String key1Name;
+    /**
+     * 电话号码
+     */
+    private String key1Phone;
+
+    /**
+     * 姓名
+     */
+    private String key2Name;
+    /**
+     * 电话号码
+     */
+    private String key2Phone;
+
+    /**
+     * 星期几的几点几分播报，星期之间逗号间隔，星期与时间空格间隔
+     * 1,2,3,4,5 13:13
+     */
+    private String newsTime;
+
+    /**
+     * 播报类型，1:实时播报，0:固定时间播报
+     */
+    private Integer newsType;
+
+    /**
+     * 服务器下发文字
+     */
+    private String news;
+}

src/main/java/com/zy/bms/common/io/wechat/SosSetIO.java

@@ -1,43 +0,0 @@
-package com.zy.bms.common.io.wechat;
-
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * SOS设置
- *
- * @author yang xiao kun
- * create on 2021/1/21
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-public class SosSetIO extends SimpleSetIO {
-
-    /**
-     * 姓名
-     */
-    private String key0Name;
-    /**
-     * 电话号码
-     */
-    private String key0Phone;
-
-    /**
-     * 姓名
-     */
-    private String key1Name;
-    /**
-     * 电话号码
-     */
-    private String key1Phone;
-
-    /**
-     * 姓名
-     */
-    private String key2Name;
-    /**
-     * 电话号码
-     */
-    private String key2Phone;
-
-}

src/main/java/com/zy/bms/common/io/wechat/VolumeSetIO.java

@@ -1,29 +0,0 @@
-package com.zy.bms.common.io.wechat;
-
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * 音量设置 入参
- *
- * @author yang xiao kun
- * create on 2021/1/21
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-public class VolumeSetIO extends SimpleSetIO {
-    /**
-     * 铃声音量
-     */
-    private Integer ringVol;
-
-    /**
-     * 系统音量
-     */
-    private Integer msgVol;
-
-    /**
-     * 通话音量
-     */
-    private Integer phoneVol;
-}

src/main/java/com/zy/bms/config/mqtt/MqttCallbackHandler.java

@@ -127,7 +127,6 @@ public class MqttCallbackHandler {
         device.setClientId(clientId);
         device.setPassword(MD5Util.MD5Encode(clientId));
         device.setGroupId(1);
-        device.setStatus(1);
         deviceService.save(device);
         SetBase setBase = new SetBase();
         setBase.setDeviceId(device.getClientId());

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

@@ -2,7 +2,6 @@ package com.zy.bms.controller.pc;
 
 import com.zy.bms.common.ServerResponse;
 import com.zy.bms.common.controller.BaseController;
-import com.zy.bms.common.io.pc.AdminIO;
 import com.zy.bms.model.Admin;
 import com.zy.bms.common.redis.SessionManager;
 import com.zy.bms.service.AdminService;
@@ -49,43 +48,6 @@ public class AdminController extends BaseController {
         return ServerResponse.createBySuccess(result);
     }
 
-    /**
-     * 添加用户
-     */
-    @PostMapping("save.do")
-    public ServerResponse save(Admin admin) {
-        Admin current = sessionManager.getUser(getToken());
-        if (current == null || current.getRole() != 1) return ServerResponse.createByWarning("无权限");
-        adminService.saveAdmin(admin);
-        return ServerResponse.createBySuccess();
-    }
-
-    /**
-     * 禁用
-     */
-    @PostMapping("forbidden.do")
-    public ServerResponse forbidden(Integer id) {
-        adminService.updateStatus(id, 0);
-        return ServerResponse.createBySuccess();
-    }
-
-    /**
-     * 启用
-     */
-    @PostMapping("permit.do")
-    public ServerResponse permit(Integer id) {
-        adminService.updateStatus(id, 1);
-        return ServerResponse.createBySuccess();
-    }
-
-    /**
-     * 分页查询管理员列表
-     */
-    @PostMapping("listPage.do")
-    public ServerResponse listPage(AdminIO io) {
-        return ServerResponse.createBySuccess(adminService.listPage(io));
-    }
-
     /**
      * token 验证
      */

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

@@ -1,71 +0,0 @@
-package com.zy.bms.controller.pc;
-
-import com.zy.bms.common.ServerResponse;
-import com.zy.bms.common.io.pc.GroupIO;
-import com.zy.bms.model.Group;
-import com.zy.bms.service.IGroupService;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.annotation.Resource;
-
-/**
- * <p>
- * 项目组 前端控制器
- * </p>
- *
- * @author chenyi
- * @since 2021-05-19
- */
-@RestController
-@RequestMapping("/builder/group")
-public class GroupController {
-    @Resource
-    private IGroupService groupService;
-
-    /**
-     * 分页查询所有项目组
-     */
-    @PostMapping("listPage")
-    public ServerResponse listPage(GroupIO io) {
-        return ServerResponse.createBySuccess(groupService.listPage(io));
-    }
-
-    /**
-     * 添加项目组
-     */
-    @PostMapping("save.do")
-    public ServerResponse save(Group group) {
-        if (groupService.checkRepeat(group.getCode())) return ServerResponse.createByWarning("添加失败:项目组编号重复");
-        return ServerResponse.createBySuccess(groupService.save(group));
-    }
-
-    /**
-     * 禁用项目组
-     */
-    @PostMapping("forbidden.do")
-    public ServerResponse forbidden(Integer id) {
-        groupService.updateStatus(id, 0);
-        return ServerResponse.createBySuccess();
-    }
-
-    /**
-     * 启用项目组
-     */
-    @PostMapping("permit.do")
-    public ServerResponse permit(Integer id) {
-        groupService.updateStatus(id, 1);
-        return ServerResponse.createBySuccess();
-    }
-
-    /**
-     * 更新项目组信息
-     */
-    @PostMapping("update.do")
-    public ServerResponse update(Group group) {
-        groupService.updateById(group);
-        return ServerResponse.createBySuccess();
-    }
-
-}

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

@@ -1,71 +0,0 @@
-package com.zy.bms.controller.pc;
-
-import com.zy.bms.common.ServerResponse;
-import com.zy.bms.common.io.pc.ItemIO;
-import com.zy.bms.model.Item;
-import com.zy.bms.service.IItemService;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.annotation.Resource;
-
-/**
- * <p>
- * 项目表 前端控制器
- * </p>
- *
- * @author chenyi
- * @since 2021-05-19
- */
-@RestController
-@RequestMapping("/builder/item")
-public class ItemController {
-
-    @Resource
-    private IItemService itemService;
-
-    /**
-     * 分页查询所有项目
-     */
-    @PostMapping("listPage.do")
-    public ServerResponse listPage(ItemIO io) {
-        return ServerResponse.createBySuccess(itemService.listPage(io));
-    }
-
-    /**
-     * 添加项目
-     */
-    @PostMapping("save.do")
-    public ServerResponse save(Item item) {
-        if (itemService.checkRepeat(item.getCode())) return ServerResponse.createByWarning("添加失败:项目编号重复");
-        return ServerResponse.createBySuccess(itemService.save(item));
-    }
-
-    /**
-     * 禁用项目
-     */
-    @PostMapping("forbidden.do")
-    public ServerResponse forbidden(Integer id) {
-        itemService.updateStatus(id, 0);
-        return ServerResponse.createBySuccess();
-    }
-
-    /**
-     * 启用项目
-     */
-    @PostMapping("permit.do")
-    public ServerResponse permit(Integer id) {
-        itemService.updateStatus(id, 1);
-        return ServerResponse.createBySuccess();
-    }
-
-    /**
-     * 更新项目信息
-     */
-    @PostMapping("update.do")
-    public ServerResponse update(Item item) {
-        itemService.updateById(item);
-        return ServerResponse.createBySuccess();
-    }
-}

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

@@ -1,7 +1,7 @@
 package com.zy.bms.controller.pc;
 
 import com.zy.bms.common.ServerResponse;
-import com.zy.bms.common.io.wechat.*;
+import com.zy.bms.common.io.wechat.SetIO;
 import com.zy.bms.service.SetBaseService;
 import com.zy.bms.service.SetService;
 import org.springframework.web.bind.annotation.*;
@@ -37,7 +37,7 @@ public class PcSetController {
      * 设置音量
      */
     @PostMapping("volume.do")
-    public ServerResponse setVolume(VolumeSetIO io) {
+    public ServerResponse setVolume(SetIO io) {
         setService.setVolume(io);
         return ServerResponse.createBySuccess();
     }
@@ -46,7 +46,7 @@ public class PcSetController {
      * 设置定位频率
      */
     @PostMapping("gpsRate.do")
-    public ServerResponse setGpsRate(GpsRateSetIO io) {
+    public ServerResponse setGpsRate(SetIO io) {
         setService.setGpsRate(io);
         return ServerResponse.createBySuccess();
     }
@@ -57,7 +57,7 @@ public class PcSetController {
      * @param io 设置参数
      */
     @PostMapping("autoAnswer.do")
-    public ServerResponse setAutoAnswer(AnswerSetIO io) {
+    public ServerResponse setAutoAnswer(SetIO io) {
         setService.setAutoAnswer(io);
         return ServerResponse.createBySuccess();
     }
@@ -66,7 +66,7 @@ public class PcSetController {
      * 设置语音播报
      */
     @PostMapping("news.do")
-    public ServerResponse setNews(NewsSetIO io) {
+    public ServerResponse setNews(SetIO io) {
         setService.setNews(io);
         return ServerResponse.createBySuccess();
     }
@@ -75,7 +75,7 @@ public class PcSetController {
      * 设置SOS紧急呼叫
      */
     @PostMapping("sos.do")
-    public ServerResponse setSOS(SosSetIO io) {
+    public ServerResponse setSOS(SetIO io) {
         setService.setSOS(io);
         return ServerResponse.createBySuccess();
     }
@@ -84,7 +84,7 @@ public class PcSetController {
      * 设置持续定位
      */
     @PostMapping("continue.do")
-    public ServerResponse setContinue(ContinueSetIO io) {
+    public ServerResponse setContinue(SetIO io) {
         setService.setContinue(io);
         return ServerResponse.createBySuccess();
     }

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

@@ -1,53 +0,0 @@
-package com.zy.bms.controller.pc;
-
-import com.zy.bms.common.ServerResponse;
-import com.zy.bms.common.io.pc.RoleIO;
-import com.zy.bms.model.Role;
-import com.zy.bms.service.IRoleService;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.annotation.Resource;
-
-/**
- * <p>
- * 角色表 前端控制器
- * </p>
- *
- * @author chenyi
- * @since 2021-05-19
- */
-@RestController
-@RequestMapping("/builder/role")
-public class RoleController {
-
-    @Resource
-    private IRoleService roleService;
-
-    /**
-     * 分页查询角色项目
-     */
-    @PostMapping("listPage")
-    public ServerResponse listPage(RoleIO io) {
-        return ServerResponse.createBySuccess(roleService.listPage(io));
-    }
-
-    /**
-     * 添加角色
-     */
-    @PostMapping("save.do")
-    public ServerResponse save(Role role) {
-        if (roleService.checkRepeat(role.getName())) return ServerResponse.createByWarning("添加失败:角色名重复");
-        return ServerResponse.createBySuccess(roleService.save(role));
-    }
-
-    /**
-     * 更新角色信息
-     */
-    @PostMapping("update.do")
-    public ServerResponse update(Role role) {
-        roleService.updateById(role);
-        return ServerResponse.createBySuccess();
-    }
-}

src/main/java/com/zy/bms/controller/wx/SetController.java

@@ -39,7 +39,7 @@ public class SetController extends BaseController {
      * 设置音量
      */
     @PostMapping("volume.do")
-    public ServerResponse setVolume(VolumeSetIO io) {
+    public ServerResponse setVolume(SetIO io) {
         if (verify(io)) setService.setVolume(io);
         return ServerResponse.createBySuccess();
     }
@@ -48,7 +48,7 @@ public class SetController extends BaseController {
      * 设置定位频率
      */
     @PostMapping("gpsRate.do")
-    public ServerResponse gpsRate(GpsRateSetIO io) {
+    public ServerResponse gpsRate(SetIO io) {
         if (verify(io)) setService.setGpsRate(io);
         return ServerResponse.createBySuccess();
     }
@@ -59,7 +59,7 @@ public class SetController extends BaseController {
      * @param io 设置参数
      */
     @PostMapping("autoAnswer.do")
-    public ServerResponse setAutoAnswer(AnswerSetIO io) {
+    public ServerResponse setAutoAnswer(SetIO io) {
         if (verify(io)) setService.setAutoAnswer(io);
         return ServerResponse.createBySuccess();
     }
@@ -68,7 +68,7 @@ public class SetController extends BaseController {
      * 设置语音播报
      */
     @PostMapping("news.do")
-    public ServerResponse setNews(NewsSetIO io) {
+    public ServerResponse setNews(SetIO io) {
         if (verify(io)) setService.setNews(io);
         return ServerResponse.createBySuccess();
     }
@@ -77,7 +77,7 @@ public class SetController extends BaseController {
      * 设置SOS紧急呼叫
      */
     @PostMapping("sos.do")
-    public ServerResponse setSOS(SosSetIO io) {
+    public ServerResponse setSOS(SetIO io) {
         if (verify(io)) setService.setSOS(io);
         return ServerResponse.createBySuccess();
     }
@@ -86,7 +86,7 @@ public class SetController extends BaseController {
      * 设置持续定位
      */
     @PostMapping("continue.do")
-    public ServerResponse setContinue(ContinueSetIO io) {
+    public ServerResponse setContinue(SetIO io) {
         if (verify(io)) setService.setContinue(io);
         return ServerResponse.createBySuccess();
     }

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

@@ -1,13 +1,8 @@
 package com.zy.bms.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.zy.bms.common.io.pc.AdminIO;
-import com.zy.bms.common.vo.AdminListVo;
 import com.zy.bms.model.Admin;
 import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
 /**
@@ -20,8 +15,4 @@ import org.springframework.stereotype.Repository;
 @Repository
 public interface AdminMapper extends BaseMapper<Admin> {
 
-    /**
-     * 分页查询管理员
-     */
-    IPage<AdminListVo> listPage(Page<AdminListVo> page, @Param("io") AdminIO io);
 }

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

@@ -1,38 +0,0 @@
-package com.zy.bms.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.zy.bms.common.io.pc.GroupIO;
-import com.zy.bms.common.vo.GroupListVo;
-import com.zy.bms.model.Group;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-import org.springframework.stereotype.Repository;
-
-/**
- * <p>
- * 项目组 Mapper 接口
- * </p>
- *
- * @author chenyi
- * @since 2021-05-19
- */
-@Mapper
-@Repository
-public interface GroupMapper extends BaseMapper<Group> {
-    /**
-     * 分页查询
-     *
-     * @param page 分页信息
-     * @param io   查询条件
-     */
-    IPage<GroupListVo> listPage(Page<GroupListVo> page, @Param("io") GroupIO io);
-
-    /**
-     * 项目组编号查重
-     *
-     * @param code 项目组编号
-     */
-    int checkRepeat(@Param("code") String code);
-}

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

@@ -1,39 +0,0 @@
-package com.zy.bms.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.zy.bms.common.io.pc.ItemIO;
-import com.zy.bms.model.Item;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-import org.springframework.stereotype.Repository;
-
-/**
- * <p>
- * 项目表 Mapper 接口
- * </p>
- *
- * @author chenyi
- * @since 2021-05-19
- */
-@Mapper
-@Repository
-public interface ItemMapper extends BaseMapper<Item> {
-    /**
-     * 分页查询
-     *
-     * @param page 分页信息
-     * @param io   查询条件
-     */
-    IPage<Item> listPage(Page<Item> page, @Param("io") ItemIO io);
-
-    /**
-     * 项目编号查重
-     *
-     * @param code 项目编号
-     */
-    int checkRepeat(@Param("code") String code);
-
-
-}

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

@@ -1,37 +0,0 @@
-package com.zy.bms.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.zy.bms.common.io.pc.RoleIO;
-import com.zy.bms.model.Role;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-import org.springframework.stereotype.Repository;
-
-/**
- * <p>
- * 角色表 Mapper 接口
- * </p>
- *
- * @author chenyi
- * @since 2021-05-19
- */
-@Mapper
-@Repository
-public interface RoleMapper extends BaseMapper<Role> {
-    /**
-     * 分页查询
-     *
-     * @param page 分页信息
-     * @param io   查询条件
-     */
-    IPage<Role> listPage(Page<Role> page, @Param("io") RoleIO io);
-
-    /**
-     * 角色名查重
-     *
-     * @param name 角色名
-     */
-    int checkRepeat(@Param("name") String name);
-}

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

@@ -1,16 +1,9 @@
 package com.zy.bms.service;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.zy.bms.common.io.pc.AdminIO;
-import com.zy.bms.common.vo.AdminListVo;
 import com.zy.bms.mapper.AdminMapper;
 import com.zy.bms.model.Admin;
-import com.zy.bms.utils.MD5Util;
-import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Service;
 
 /**
@@ -22,14 +15,6 @@ import org.springframework.stereotype.Service;
 @Service
 public class AdminService extends ServiceImpl<AdminMapper, Admin> {
 
-    /**
-     * 分页查询管理员列表
-     */
-    public IPage<AdminListVo> listPage(@Param("io") AdminIO io) {
-        Page<AdminListVo> page = new Page<>(io.getCurrent(), io.getSize());
-        return baseMapper.listPage(page, io);
-    }
-
     /**
      * 查询用户信息
      *
@@ -40,25 +25,4 @@ public class AdminService extends ServiceImpl<AdminMapper, Admin> {
         queryWrapper.eq("username", content).or().eq("phone", content);
         return baseMapper.selectOne(queryWrapper);
     }
-
-    /**
-     * 添加用户
-     */
-    public void saveAdmin(Admin admin) {
-        admin.setPassword(MD5Util.MD5Encode(admin.getPassword()));
-        admin.setStatus(1);
-        save(admin);
-    }
-
-    /**
-     * 更新用户状态
-     *
-     * @param id     主键ID
-     * @param status 状态
-     */
-    public void updateStatus(Integer id, Integer status) {
-        UpdateWrapper<Admin> updateWrapper = new UpdateWrapper<>();
-        updateWrapper.set("status", status).eq("id", id);
-        update(updateWrapper);
-    }
 }

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

@@ -1,41 +0,0 @@
-package com.zy.bms.service;
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.zy.bms.common.io.pc.GroupIO;
-import com.zy.bms.common.vo.GroupListVo;
-import com.zy.bms.model.Group;
-
-/**
- * <p>
- * 项目组 服务类
- * </p>
- *
- * @author chenyi
- * @since 2021-05-19
- */
-public interface IGroupService extends IService<Group> {
-
-    /**
-     * 分页查询
-     *
-     * @param io 查询条件
-     */
-    IPage<GroupListVo> listPage(GroupIO io);
-
-
-    /**
-     * 项目编号查重
-     *
-     * @param code 项目编号
-     */
-    boolean checkRepeat(String code);
-
-    /**
-     * 更新项目组状态
-     *
-     * @param id     主键ID
-     * @param status 状态
-     */
-    void updateStatus(Integer id, Integer status);
-}

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

@@ -1,39 +0,0 @@
-package com.zy.bms.service;
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.zy.bms.common.io.pc.ItemIO;
-import com.zy.bms.model.Item;
-
-/**
- * <p>
- * 项目表 服务类
- * </p>
- *
- * @author chenyi
- * @since 2021-05-19
- */
-public interface IItemService extends IService<Item> {
-
-    /**
-     * 分页查询
-     *
-     * @param io 查询条件
-     */
-    IPage<Item> listPage(ItemIO io);
-
-    /**
-     * 项目编号查重
-     *
-     * @param code 项目编号
-     */
-    boolean checkRepeat(String code);
-
-    /**
-     * 更新项目状态
-     *
-     * @param id     主键ID
-     * @param status 状态
-     */
-    void updateStatus(Integer id, Integer status);
-}

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

@@ -1,31 +0,0 @@
-package com.zy.bms.service;
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.zy.bms.common.io.pc.RoleIO;
-import com.zy.bms.model.Role;
-
-/**
- * <p>
- * 角色表 服务类
- * </p>
- *
- * @author chenyi
- * @since 2021-05-19
- */
-public interface IRoleService extends IService<Role> {
-
-    /**
-     * 分页查询
-     *
-     * @param io 查询条件
-     */
-    IPage<Role> listPage(RoleIO io);
-
-    /**
-     * 角色名查重
-     *
-     * @param name 角色名
-     */
-    boolean checkRepeat(String name);
-}

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

@@ -1,5 +1,8 @@
 package com.zy.bms.service;
 
+import com.zy.bms.common.Constant;
+import com.zy.bms.common.dto.MqttMsgDto;
+import com.zy.bms.config.mqtt.MqttGateway;
 import com.zy.bms.model.SetBase;
 import com.zy.bms.model.SetNews;
 import com.zy.bms.utils.BeanUtil;
@@ -8,6 +11,7 @@ import org.springframework.stereotype.Component;
 
 import javax.annotation.Resource;
 import java.time.LocalDateTime;
+import java.util.Set;
 
 /**
  * 设备设置 Service
@@ -21,14 +25,16 @@ public class SetService {
     @Resource
     private SetBaseService setBaseService;
     @Resource
-    private SetToDeviceService setToDeviceService;
-    @Resource
     private SetNewsService setNewsService;
+    @Resource
+    private MqttGateway mqttGateway;
+    @Resource
+    private MqttLogService mqttLogService;
 
     /**
      * 设置音量
      */
-    public void setVolume(VolumeSetIO io) {
+    public void setVolume(SetIO io) {
         //发送模板消息给设备
         setToDeviceService.setVolume(io);
         //保存数据库
@@ -38,7 +44,7 @@ public class SetService {
     /**
      * 设置定位频率
      */
-    public void setGpsRate(GpsRateSetIO io) {
+    public void setGpsRate(SetIO io) {
         //发送模板消息给设备
         setToDeviceService.setGpsRate(io);
         //保存数据库
@@ -48,7 +54,7 @@ public class SetService {
     /**
      * 自动接听
      */
-    public void setAutoAnswer(AnswerSetIO io) {
+    public void setAutoAnswer(SetIO io) {
         //发送模板消息给设备
         setToDeviceService.setAutoAnswer(io);
         //保存数据库
@@ -58,7 +64,7 @@ public class SetService {
     /**
      * 设置语音播报
      */
-    public void setNews(NewsSetIO io) {
+    public void setNews(SetIO io) {
         //发送模板消息给设备
         setToDeviceService.sendNews(io);
         //保存数据库
@@ -70,7 +76,7 @@ public class SetService {
     /**
      * 设置SOS紧急呼叫
      */
-    public void setSOS(SosSetIO io) {
+    public void setSOS(SetIO io) {
         //发送模板消息给设备
         setToDeviceService.setSOS(io);
         //保存数据库
@@ -80,7 +86,7 @@ public class SetService {
     /**
      * 设置持续定位
      */
-    public void setContinue(ContinueSetIO io) {
+    public void setContinue(SetIO io) {
         //发送模板消息给设备
         setToDeviceService.setContinue(io);
         //保存数据库
@@ -90,9 +96,55 @@ public class SetService {
     /**
      * 保存基本设置数据
      */
-    private void saveBaseSet(Object io) {
+    private void saveBaseSet(SetIO io) {
         //保存数据库
         SetBase entity = BeanUtil.cast(io, SetBase.class);
         setBaseService.updateByDeviceId(entity);
     }
+
+    /**
+     * 组装需要发送的模板消息
+     *
+     * @param code 协议中 M 值
+     * @param io   设置信息
+     * @return 模板消息对象
+     */
+    private MqttMsgDto getMqttMsgDtoByCode(String code, SetIO io) {
+        MqttMsgDto result = new MqttMsgDto(code, io.getDeviceId());
+        switch (code) {
+            //自动接听
+            case Constant.M_CODE_AUTO_ANSWER: {
+                result.set("autoanswer", io.getAutoAnswer());
+                break;
+            }
+            //音量
+            case Constant.M_CODE_VOLUME: {
+                result.set("msgvol", io.getMsgVol()).set("phonevol", io.getPhoneVol()).set("msgtype", 1);
+                break;
+            }
+            //定位频率
+            case Constant.M_CODE_GPS_RATE: {
+                result.set("GPS_rate", io.getGpsRate());
+                break;
+            }
+            //语音播报
+            case Constant.M_CODE_NEWS: {
+                result.set("newstype", io.getNewsType()).set("newstime", io.getNewsTime()).set("news", io.getNews());
+                break;
+            }
+            //SOS紧急呼叫
+            case Constant.M_CODE_SOS: {
+                result.set("key0_name", io.getKey0Name()).set("key0_phone", io.getKey0Phone())
+                        .set("key1_name", io.getKey1Name()).set("key1_phone", io.getKey1Phone())
+                        .set("key2_name", io.getKey2Name()).set("key2_phone", io.getKey2Phone());
+                break;
+            }
+            //持续定位
+            case Constant.M_CODE_CONTINUE_GPS: {
+                result.set("highfreq", io.getHighFreq());
+                break;
+            }
+        }
+        return result;
+    }
 }

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

@@ -51,7 +51,7 @@ public class SetToDeviceService {
      *
      * @param io 设置参数
      */
-    public void setVolume(VolumeSetIO io) {
+    public void setVolume(SetIO io) {
         //发送模板消息给设备
         MqttMsgDto msg = new MqttMsgDto(Constant.M_CODE_VOLUME, io.getDeviceId());
         msg.set("msgvol", io.getMsgVol())
@@ -65,7 +65,7 @@ public class SetToDeviceService {
      *
      * @param io 设置参数
      */
-    public void setGpsRate(GpsRateSetIO io) {
+    public void setGpsRate(SetIO io) {
         //发送模板消息给设备
         MqttMsgDto msg = new MqttMsgDto(Constant.M_CODE_GPS_RATE, io.getDeviceId());
         msg.set("GPS_rate", io.getGpsRate());
@@ -77,7 +77,7 @@ public class SetToDeviceService {
      *
      * @param io 设置参数
      */
-    public void setAutoAnswer(AnswerSetIO io) {
+    public void setAutoAnswer(SetIO io) {
         //发送模板消息给设备
         MqttMsgDto msg = new MqttMsgDto(Constant.M_CODE_AUTO_ANSWER, io.getDeviceId());
         msg.set("autoanswer", io.getAutoAnswer());
@@ -87,7 +87,7 @@ public class SetToDeviceService {
     /**
      * 设置语音播报
      */
-    public void sendNews(NewsSetIO io) {
+    public void sendNews(SetIO io) {
         //发送模板消息给设备
         MqttMsgDto msg = new MqttMsgDto(Constant.M_CODE_NEWS, io.getDeviceId());
         msg.set("newstype", io.getNewsType())
@@ -99,7 +99,7 @@ public class SetToDeviceService {
     /**
      * 设置SOS紧急呼叫
      */
-    public void setSOS(SosSetIO io) {
+    public void setSOS(SetIO io) {
         //发送模板消息给设备
         MqttMsgDto msg = new MqttMsgDto(Constant.M_CODE_SOS, io.getDeviceId());
         msg.set("key0_name", io.getKey0Name())
@@ -114,7 +114,7 @@ public class SetToDeviceService {
     /**
      * 设置持续定位
      */
-    public void setContinue(ContinueSetIO io) {
+    public void setContinue(SetIO io) {
         //发送模板消息给设备
         MqttMsgDto msg = new MqttMsgDto(Constant.M_CODE_CONTINUE_GPS, io.getDeviceId());
         msg.set("highfreq", io.getHighFreq());

src/main/java/com/zy/bms/service/impl/GroupServiceImpl.java

@@ -1,42 +0,0 @@
-package com.zy.bms.service.impl;
-
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.zy.bms.common.io.pc.GroupIO;
-import com.zy.bms.common.vo.GroupListVo;
-import com.zy.bms.model.Group;
-import com.zy.bms.mapper.GroupMapper;
-import com.zy.bms.service.IGroupService;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- * 项目组 服务实现类
- * </p>
- *
- * @author chenyi
- * @since 2021-05-19
- */
-@Service
-public class GroupServiceImpl extends ServiceImpl<GroupMapper, Group> implements IGroupService {
-
-    @Override
-    public IPage<GroupListVo> listPage(GroupIO io) {
-        Page<GroupListVo> page = new Page<>(io.getCurrent(), io.getSize());
-        return baseMapper.listPage(page, io);
-    }
-
-    @Override
-    public boolean checkRepeat(String code) {
-        return baseMapper.checkRepeat(code) > 0;
-    }
-
-    @Override
-    public void updateStatus(Integer id, Integer status) {
-        UpdateWrapper<Group> updateWrapper = new UpdateWrapper<>();
-        updateWrapper.set("status", status).eq("id", id);
-        update(updateWrapper);
-    }
-}

src/main/java/com/zy/bms/service/impl/ItemServiceImpl.java

@@ -1,47 +0,0 @@
-package com.zy.bms.service.impl;
-
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.zy.bms.common.io.pc.ItemIO;
-import com.zy.bms.mapper.ItemMapper;
-import com.zy.bms.model.Item;
-import com.zy.bms.service.IItemService;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- * 项目表 服务实现类
- * </p>
- *
- * @author chenyi
- * @since 2021-05-19
- */
-@Service
-public class ItemServiceImpl extends ServiceImpl<ItemMapper, Item> implements IItemService {
-
-    @Override
-    public IPage<Item> listPage(ItemIO io) {
-        Page<Item> page = new Page<>(io.getCurrent(), io.getSize());
-        return baseMapper.listPage(page, io);
-    }
-
-    @Override
-    public boolean checkRepeat(String code) {
-        return baseMapper.checkRepeat(code) > 0;
-    }
-
-    /**
-     * 更新用户状态
-     *
-     * @param id     主键ID
-     * @param status 状态
-     */
-    @Override
-    public void updateStatus(Integer id, Integer status) {
-        UpdateWrapper<Item> updateWrapper = new UpdateWrapper<>();
-        updateWrapper.set("status", status).eq("id", id);
-        update(updateWrapper);
-    }
-}

src/main/java/com/zy/bms/service/impl/RoleServiceImpl.java

@@ -1,33 +0,0 @@
-package com.zy.bms.service.impl;
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.zy.bms.common.io.pc.RoleIO;
-import com.zy.bms.mapper.RoleMapper;
-import com.zy.bms.model.Role;
-import com.zy.bms.service.IRoleService;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- * 角色表 服务实现类
- * </p>
- *
- * @author chenyi
- * @since 2021-05-19
- */
-@Service
-public class RoleServiceImpl extends ServiceImpl<RoleMapper, Role> implements IRoleService {
-
-    @Override
-    public IPage<Role> listPage(RoleIO io) {
-        Page<Role> page = new Page<>(io.getCurrent(), io.getSize());
-        return baseMapper.listPage(page, io);
-    }
-
-    @Override
-    public boolean checkRepeat(String name) {
-        return baseMapper.checkRepeat(name) > 0;
-    }
-}

src/main/resources/mapper/AdminMapping.xml

@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.zy.bms.mapper.AdminMapper">
-
-    <select id="listPage" resultType="com.zy.bms.common.vo.AdminListVo">
-        SELECT
-            t1.id,
-            t1.username,
-            t1.nickname,
-            t1.phone,
-            t2.`name` AS role,
-            t1.status,
-            t1.createTime
-        FROM admin t1
-        LEFT JOIN role t2 ON t1.role = t2.id
-        <where>
-            <if test="io.key != null and io.key != ''">
-                AND
-                ( username LIKE CONCAT("%",#{io.key},"%")
-                OR nickname LIKE CONCAT("%",#{io.key},"%")
-                OR phone LIKE CONCAT("%",#{io.key},"%") )
-            </if>
-            <if test="status != null">
-                AND (status = #{io.status}
-            </if>
-            <if test="role != null">
-                AND (role = #{io.role}
-            </if>
-        </where>
-        ORDER BY createTime DESC
-    </select>
-
-</mapper>

src/main/resources/mapper/GroupMapper.xml

@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.zy.bms.mapper.GroupMapper">
-
-    <select id="listPage" resultType="com.zy.bms.common.vo.GroupListVo">
-        SELECT
-        t1.*,
-        t2.`name` AS item
-        FROM `group` t1
-        LEFT JOIN item t2 ON t1.itemId = t2.id
-        <where>
-            <if test="io.key != null and io.key != ''">
-                AND
-                ( code LIKE CONCAT("%",#{io.key},"%")
-                OR name LIKE CONCAT("%",#{io.key},"%") )
-            </if>
-            <if test="status != null">
-                AND (status = #{io.status}
-            </if>
-        </where>
-        ORDER BY createTime DESC
-    </select>
-
-    <select id="checkRepeat" resultType="java.lang.Integer">
-        SELECT IFNULL( (SELECT 1 FROM `group` WHERE code = #{code} LIMIT 1) ,0)
-    </select>
-
-</mapper>

src/main/resources/mapper/ItemMapper.xml

@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.zy.bms.mapper.ItemMapper">
-
-    <select id="listPage" resultType="com.zy.bms.model.Item">
-        SELECT
-        *
-        FROM item
-        <where>
-            <if test="io.key != null and io.key != ''">
-                AND
-                ( code LIKE CONCAT("%",#{io.key},"%")
-                OR name LIKE CONCAT("%",#{io.key},"%") )
-            </if>
-            <if test="status != null">
-                AND (status = #{io.status}
-            </if>
-        </where>
-        ORDER BY createTime DESC
-    </select>
-
-    <select id="checkRepeat" resultType="java.lang.Integer">
-        SELECT IFNULL( (SELECT 1 FROM item WHERE code = #{code} LIMIT 1) ,0)
-    </select>
-
-</mapper>

src/main/resources/mapper/RoleMapper.xml

@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.zy.bms.mapper.RoleMapper">
-
-    <select id="listPage" resultType="com.zy.bms.model.Role">
-        SELECT
-        *
-        FROM role
-        <where>
-            <if test="io.name != null and io.name != ''">
-                AND name LIKE CONCAT("%",#{io.name},"%")
-            </if>
-        </where>
-        ORDER BY createTime DESC
-    </select>
-
-    <select id="checkRepeat" resultType="java.lang.Integer">
-        SELECT IFNULL( (SELECT 1 FROM role WHERE `name` = #{name} LIMIT 1) ,0)
-    </select>
-
-</mapper>