Merge branch 'master' of http://112.74.63.130:8088/r/XimengPole/XMPoleManager

chenjiantian

2021-12-06 9070f7f87763b6427377c50f39017e90ac3b77af

Merge branch 'master' of http://112.74.63.130:8088/r/XimengPole/XMPoleManager

 dao/src/main/java/com/sandu/ximon/dao/domain/ForHelp.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,24 @@
package com.sandu.ximon.dao.domain;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import lombok.Data;

import java.io.Serializable;
import java.time.LocalDateTime;

@Data
public class ForHelp implements Serializable {
    @TableId(type = IdType.AUTO)
    private Long id;
    //所属人
    private Long userId;
    //灯杆ID
    private int lightPoleId;
    //灯杆名称
    private String lightPoleName;
    //状态
    private int state;
    //接入时间
    private LocalDateTime createTime;
}

 dao/src/main/java/com/sandu/ximon/dao/domain/SingleLampData.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,53 @@
package com.sandu.ximon.dao.domain;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import lombok.Data;

import java.io.Serializable;
import java.time.LocalDateTime;

@Data
public class SingleLampData implements Serializable {

    @TableId(type = IdType.AUTO)
    private Long id;

    private Long userId;

    /*灯杆名称*/
    private String lampName;

    /*市电电压*/
    private Double mainsVoltage;

    /*市电电流*/
    private Double mainsCurrent;

    /*设备温度*/
    private Double temperature;

    /*功率因数*/
    private Double powerFactor;

    /*有功功率*/
    private Integer activePower;

    /*本次亮灯时间*/
    private LocalDateTime lightingTime;

    /*本次用电量*/
    private Double electricityConsumption;

    /*总用电量*/
    private Double totalAlectricityConsumption;

    /*灯杆亮度*/
    private Double lightPoleBrightness;

    /*更新时间*/
    private LocalDateTime updateTime;



}

 dao/src/main/java/com/sandu/ximon/dao/mapper/ForHelpMapper.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,9 @@
package com.sandu.ximon.dao.mapper;

import com.sandu.common.domain.BaseMapper;
import com.sandu.ximon.dao.domain.ForHelp;
import org.apache.ibatis.annotations.Mapper;

@Mapper
public interface ForHelpMapper extends BaseMapper<ForHelp> {
}

 dao/src/main/java/com/sandu/ximon/dao/mapper/SingleLampDataMapper.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,9 @@
package com.sandu.ximon.dao.mapper;

import com.sandu.common.domain.BaseMapper;
import com.sandu.ximon.dao.domain.SingleLampData;
import org.apache.ibatis.annotations.Mapper;

@Mapper
public interface SingleLampDataMapper extends BaseMapper<SingleLampData> {
}

 dao/src/main/resources/mapper/ForHelpMapper.xml

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,16 @@
<?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.sandu.ximon.dao.mapper.ForHelpMapper">

    <resultMap id="BaseResultMap" type="com.sandu.ximon.dao.domain.ForHelp">
        <id property="id" column="id" jdbcType="BIGINT"/>
        <result property="userId" column="user_id" jdbcType="BIGINT"/>
        <result property="lightPoleId" column="light_pole_id" jdbcType="INTEGER"/>
        <result property="lightPoleName" column="light_pole_name" jdbcType="VARCHAR"/>
        <result property="state" column="state" jdbcType="INTEGER"/>
        <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
    </resultMap>

</mapper>

 dao/src/main/resources/mapper/GroupMapper.xml

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,23 @@
<?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.sandu.ximon.dao.mapper.GroupMapper">

    <resultMap id="BaseResultMap" type="com.sandu.ximon.dao.domain.Groups">
        <id property="id" column="id" jdbcType="BIGINT"/>
        <id property="userId" column="user_id" jdbcType="BIGINT"/>
        <result property="name" column="name" jdbcType="VARCHAR"/>
        <result property="count" column="count" jdbcType="INTEGER"/>
        <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
    </resultMap>
    <select id="groupList" resultType="com.sandu.ximon.dao.domain.Groups">
        select
               *
        from
             lamp_group
        where
              user_id=#{userId}
    </select>

</mapper>

 dao/src/main/resources/mapper/SingleLampDataMapper.xml

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,23 @@
<?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.sandu.ximon.dao.mapper.SingleLampDataMapper">

    <resultMap id="BaseResultMap" type="com.sandu.ximon.dao.domain.SingleLampData">
        <id property="id" column="id" jdbcType="BIGINT"/>
        <id property="userId" column="user_id" jdbcType="BIGINT"/>
        <result property="lampName" column="lamp_name" jdbcType="VARCHAR"/>
        <result property="mainsVoltage" column="mains_voltage" jdbcType="DOUBLE"/>
        <result property="mainsCurrent" column="mains_current" jdbcType="DOUBLE"/>
        <result property="temperature" column="temperature" jdbcType="DOUBLE"/>
        <result property="powerFactor" column="power_factor" jdbcType="DOUBLE"/>
        <result property="activePower" column="active_power" jdbcType="INTEGER"/>
        <result property="lightingTime" column="lighting_time" jdbcType="TIMESTAMP"/>
        <result property="electricityConsumption" column="electricity_eonsumption" jdbcType="DOUBLE"/>
        <result property="totalAlectricityConsumption" column="total_electricity_eonsumption" jdbcType="DOUBLE"/>
        <result property="lightPoleBrightness" column="light_pole_brightness" jdbcType="DOUBLE"/>
        <result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
    </resultMap>

</mapper>

 ximon-admin/src/main/java/com/sandu/ximon/admin/controller/ClientController.java

@@ -6,6 +6,7 @@
import com.sandu.ximon.admin.param.ClientPrarm;
import com.sandu.ximon.admin.security.SecurityUtils;
import com.sandu.ximon.admin.service.ClientService;
import com.sandu.ximon.dao.enums.AdministratorEnums;
import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.*;

@@ -60,7 +61,7 @@
        }else {

        }*/
        if(SecurityUtils.getClientId().equals(SecurityUtils.getAdministratorIdentity())) {
        if(AdministratorEnums.CUSTOMER.getCode().equals(SecurityUtils.getAdministratorIdentity())) {
            return ResponseUtil.success(clientService.clientList(SecurityUtils.getUserId()));
            //   }else if("0".equals(SecurityUtils.getAdministratorIdentity())){
        }else {

 ximon-admin/src/main/java/com/sandu/ximon/admin/controller/ForHelpController.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,37 @@
package com.sandu.ximon.admin.controller;

import com.sandu.common.domain.ResponseVO;
import com.sandu.common.util.ResponseUtil;
import com.sandu.ximon.admin.service.ForHelpService;
import com.sandu.ximon.admin.service.WaterQualityEquipmentService;
import com.sandu.ximon.dao.domain.ForHelp;
import com.sandu.ximon.dao.domain.WaterQualityEquipment;
import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.*;

import java.util.List;

@RestController
@AllArgsConstructor
@RequestMapping("/v1/admin/forhelp")
public class ForHelpController {
    private final ForHelpService forHelpService;

    @GetMapping
    public ResponseVO<Object> listForHelp() {
        List<ForHelp> list = forHelpService.listForHelp();
        return ResponseUtil.successPage(list);
    }

    /**
     * æ¨¡ç³ŠæŸ¥è¯¢
     *
     * @return
     */
    @GetMapping("/listForHelpByKeyword/{keyword}")
    public ResponseVO<Object> listForHelpByKeyword(@PathVariable String keyword) {
        List<ForHelp> list = forHelpService.listForHelpByKeyword(keyword);
        return ResponseUtil.successPage(list);
    }

}

 ximon-admin/src/main/java/com/sandu/ximon/admin/controller/WaterQualityDataController.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,40 @@
package com.sandu.ximon.admin.controller;

import com.sandu.common.domain.ResponseVO;
import com.sandu.common.util.ResponseUtil;
import com.sandu.ximon.admin.service.AirDataService;
import com.sandu.ximon.admin.service.WaterQualityDataService;
import com.sandu.ximon.dao.domain.AirData;
import com.sandu.ximon.dao.domain.WaterQualityData;
import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;

import java.util.List;

@RestController
@AllArgsConstructor
@RequestMapping("/v1/admin/waterqualitydata")
public class WaterQualityDataController {
    private final WaterQualityDataService waterQualityDataService;

    @GetMapping
    public ResponseVO<Object> listWaterQualityData() {
        List<WaterQualityData> list = waterQualityDataService.listWaterQualityData();
        return ResponseUtil.successPage(list);
    }

    /**
     * æ¨¡ç³ŠæŸ¥è¯¢
     *
     * @return
     */
    @GetMapping("/listWaterQualityDataByKeyword/{keyword}")
    public ResponseVO<Object> listWaterQualityDataByKeyword(@PathVariable String keyword) {
        List<WaterQualityData> list = waterQualityDataService.listWaterQualityDataByKeyword(keyword);
        return ResponseUtil.successPage(list);
    }

}

 ximon-admin/src/main/java/com/sandu/ximon/admin/controller/WaterQualityEquipmentController.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,46 @@
package com.sandu.ximon.admin.controller;

import com.sandu.common.domain.ResponseVO;
import com.sandu.common.util.ResponseUtil;
import com.sandu.ximon.admin.service.AirEquipmentService;
import com.sandu.ximon.admin.service.WaterQualityEquipmentService;
import com.sandu.ximon.dao.domain.AirEquipment;
import com.sandu.ximon.dao.domain.WaterQualityEquipment;
import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.*;

import java.util.List;

@RestController
@AllArgsConstructor
@RequestMapping("/v1/admin/waterqualityequipment")
public class WaterQualityEquipmentController {
    private final WaterQualityEquipmentService waterQualityEquipmentService;

    @GetMapping
    public ResponseVO<Object> listWaterQualityEquipment() {
        List<WaterQualityEquipment> list = waterQualityEquipmentService.listWaterQualityEquipment();
        return ResponseUtil.successPage(list);
    }

    /**
     * æ¨¡ç³ŠæŸ¥è¯¢
     *
     * @return
     */
    @GetMapping("/listWaterQualityEquipmentByKeyword/{keyword}")
    public ResponseVO<Object> listWaterQualityEquipmentByKeyword(@PathVariable String keyword) {
        List<WaterQualityEquipment> list = waterQualityEquipmentService.listWaterQualityEquipmentByKeyword(keyword);
        return ResponseUtil.successPage(list);
    }

    @PostMapping("/delete/{id}")
    public ResponseVO<Object> deleteWaterQualityEquipment(@PathVariable Long id) {
        boolean result = waterQualityEquipmentService.deleteWaterQualityEquipment(id);
        if (result) {
            return ResponseUtil.success(null);
        } else {
            return ResponseUtil.fail("操作失败");
        }
    }
}

 ximon-admin/src/main/java/com/sandu/ximon/admin/service/ForHelpService.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,49 @@
package com.sandu.ximon.admin.service;

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.sandu.common.execption.BusinessException;
import com.sandu.common.service.impl.BaseServiceImpl;
import com.sandu.ximon.dao.domain.ForHelp;
import com.sandu.ximon.dao.domain.WaterQualityEquipment;
import com.sandu.ximon.dao.mapper.ForHelpMapper;
import com.sandu.ximon.dao.mapper.WaterQualityEquipmentMapper;
import lombok.AllArgsConstructor;
import org.springframework.stereotype.Service;

import java.util.List;

@Service
@AllArgsConstructor
public class ForHelpService extends BaseServiceImpl<ForHelpMapper, ForHelp> {

    /**
     * æŸ¥è¯¢å…¨éƒ¨æ°´è´¨è®¾å¤‡
     */
    public List<ForHelp> listForHelp() {
        LambdaQueryWrapper<ForHelp> wrapper = Wrappers.lambdaQuery(ForHelp.class);
        List<ForHelp> list = list(wrapper);

        return list;
    }

    /**
     * æ¨¡ç³ŠæŸ¥è¯¢
     */
    public List<ForHelp> listForHelpByKeyword(String keyword) {

        LambdaQueryWrapper<ForHelp> wrapper = Wrappers.lambdaQuery(ForHelp.class);
        if (keyword != null) {
            wrapper.like(ForHelp::getLightPoleName, keyword).or(
                    lambdaQueryWrapper -> {
                        lambdaQueryWrapper.like(ForHelp::getLightPoleId, keyword);
                    }


            );
        }
        List<ForHelp> forHelpList = list(wrapper);
        return forHelpList;
    }

}