2021与蓝度共同重构项目,服务端
zhanzhiqin
2022-05-09 52eb3f0befcb397d2fdd645c8d7471d6ee477f87
权限
已修改5个文件
29 ■■■■■ 文件已修改
dao/src/main/java/com/sandu/ximon/dao/enums/MenuEnum.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
dao/src/main/java/com/sandu/ximon/dao/mapper/AirDataMapper.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
dao/src/main/resources/mapper/AirDataMapper.xml 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/AirDataController.java 13 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ximon-admin/src/main/java/com/sandu/ximon/admin/service/AirDataService.java 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
dao/src/main/java/com/sandu/ximon/dao/enums/MenuEnum.java
@@ -183,8 +183,6 @@
    XIXUN_PLAN_SCHEDULE("熙讯执行中的定时"),
    XIXUN_CLOSE_AIR("熙讯关闭大气推送"),
    XIXUN_CLEAN("熙讯清屏"),
    WATER_EQUIPMENT_ADD("新增水质设备");
dao/src/main/java/com/sandu/ximon/dao/mapper/AirDataMapper.java
@@ -13,7 +13,6 @@
 */
@Mapper
public interface AirDataMapper extends BaseMapper<AirData> {
    List<String> listAirEquipmentMAC();
    List<Long> listAirId(String keyword, Long userid);
dao/src/main/resources/mapper/AirDataMapper.xml
@@ -31,12 +31,6 @@
        <result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
    </resultMap>
    <select id="listAirEquipmentMAC" resultType="java.lang.String">
        SELECT DISTINCT device_mac
        FROM air_data
    </select>
    <select id="listAirId" resultType="java.lang.Long">
        SELECT
        MAX(t1.id) AS air_id
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/AirDataController.java
@@ -47,19 +47,6 @@
        return ResponseUtil.successPage(list);
    }
    /**
     * 查询大气设备MAC地址
     *
     * @return
     */
    @GetMapping("/listAirEquipmentMAC")
    public ResponseVO<Object> listAirEquipmentMAC() {
        //TODO
        List<String> list = airDataService.listAirEquipmentMAC();
        return ResponseUtil.success(list);
    }
    @PostMapping("/updateAirEquipmentInfo")
    public ResponseVO<Object> updataAirEquipmentInfo(@RequestBody List<String> listMac) {
        if (!permissionConfig.check(MenuEnum.AIR_DATA_UPDATE.getCode())) {
ximon-admin/src/main/java/com/sandu/ximon/admin/service/AirDataService.java
@@ -72,13 +72,6 @@
    }
    /**
     * 查询大气设备MAC地址
     */
    public List<String> listAirEquipmentMAC() {
        return airDataMapper.listAirEquipmentMAC();
    }
    /**
     * +
     * 根据灯杆id查询大气数据
     */