新增 杀虫灯获取折线图数据列表接口

src/main/java/com/yunfeiyun/agmp/iotm/device/qxsqz/service/IIotYfQxzCommService.java

@@ -41,7 +41,7 @@ import java.text.ParseException;
 import java.util.*;
 
 @Slf4j
-public class IIotYfQxzCommService extends IotDeviceBaseServiceImpl implements IotDeviceBaseService {
+public class IIotQxzCommService extends IotDeviceBaseServiceImpl implements IotDeviceBaseService {
     @Autowired
     private MongoService mongoService;
 

src/main/java/com/yunfeiyun/agmp/iotm/device/qxsqz/service/impl/IotXphYfQxzMqttServiceImpl.java

@@ -3,7 +3,7 @@ package com.yunfeiyun.agmp.iotm.device.qxsqz.service.impl;
 import com.yunfeiyun.agmp.iot.common.constant.devicetype.ServiceNameConst;
 import com.yunfeiyun.agmp.iot.common.domain.IotDevice;
 import com.yunfeiyun.agmp.iotm.device.common.domin.DeviceRefreshDto;
-import com.yunfeiyun.agmp.iotm.device.qxsqz.service.IIotYfQxzCommService;
+import com.yunfeiyun.agmp.iotm.device.qxsqz.service.IIotQxzCommService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
@@ -14,7 +14,7 @@ import org.springframework.stereotype.Service;
 
 @Slf4j
 @Service(value = ServiceNameConst.SERVICE_XPH_YF_QXZ)
-public class IotXphYfQxzMqttServiceImpl extends IIotYfQxzCommService {
+public class IotXphYfQxzMqttServiceImpl extends IIotQxzCommService {
     @Override
     public void refresh(DeviceRefreshDto reqVo) {
         IotDevice findDevice = reqVo.getIotDevice();

src/main/java/com/yunfeiyun/agmp/iotm/device/qxsqz/service/impl/IotYfQxzServiceImpl.java

@@ -8,7 +8,7 @@ import com.yunfeiyun.agmp.iot.common.domain.IotDevice;
 import com.yunfeiyun.agmp.iot.common.domain.IotDeviceconfig;
 import com.yunfeiyun.agmp.iot.common.model.cmd.CmdGroupModel;
 import com.yunfeiyun.agmp.iotm.device.common.domin.DeviceRefreshDto;
-import com.yunfeiyun.agmp.iotm.device.qxsqz.service.IIotYfQxzCommService;
+import com.yunfeiyun.agmp.iotm.device.qxsqz.service.IIotQxzCommService;
 import com.yunfeiyun.agmp.iotm.web.service.IIotCmdtaskService;
 import com.yunfeiyun.agmp.iotm.web.service.IIotDeviceconfigService;
 import lombok.extern.slf4j.Slf4j;
@@ -19,7 +19,7 @@ import javax.annotation.Resource;
 
 @Service(value = ServiceNameConst.SERVICE_YF_QXZ)
 @Slf4j
-public class IotYfQxzServiceImpl extends IIotYfQxzCommService {
+public class IotYfQxzServiceImpl extends IIotQxzCommService {
 
     @Autowired
     private IIotCmdtaskService iIotCmdtaskService;

src/main/java/com/yunfeiyun/agmp/iotm/device/qxsqz/service/impl/IotYfQxzServiceImplbackup.java

@@ -1,375 +0,0 @@
-//package com.yunfeiyun.agmp.iotm.device.qxsqz.service.impl;
-//
-//import com.alibaba.fastjson2.JSONArray;
-//import com.alibaba.fastjson2.JSONObject;
-//import com.baomidou.mybatisplus.core.metadata.IPage;
-//import com.yunfeiyun.agmp.common.constant.ErrorCode;
-//import com.yunfeiyun.agmp.common.core.page.PageDomain;
-//import com.yunfeiyun.agmp.common.core.page.TableDataInfo;
-//import com.yunfeiyun.agmp.common.core.page.TableSupport;
-//import com.yunfeiyun.agmp.common.framework.manager.RedisCacheManager;
-//import com.yunfeiyun.agmp.common.utils.DateUtils;
-//import com.yunfeiyun.agmp.common.utils.JSONUtils;
-//import com.yunfeiyun.agmp.common.utils.StringUtils;
-//import com.yunfeiyun.agmp.common.utils.uuid.IdUtils;
-//import com.yunfeiyun.agmp.iot.common.constant.IotErrorCode;
-//import com.yunfeiyun.agmp.iot.common.constant.device.ElementFactorUtil;
-//import com.yunfeiyun.agmp.iot.common.constant.devicetype.ServiceNameConst;
-//import com.yunfeiyun.agmp.iot.common.domain.*;
-//import com.yunfeiyun.agmp.iot.common.exception.IotBizException;
-//import com.yunfeiyun.agmp.iot.common.model.cmd.CmdGroupModel;
-//import com.yunfeiyun.agmp.iot.common.service.MongoService;
-//import com.yunfeiyun.agmp.iotm.device.common.domin.DeviceRefreshDto;
-//import com.yunfeiyun.agmp.iotm.device.common.service.IotDeviceBaseService;
-//import com.yunfeiyun.agmp.iotm.device.common.service.impl.IotDeviceBaseServiceImpl;
-//import com.yunfeiyun.agmp.iotm.device.qxsqz.domain.IotDeviceQxzDataListReqVo;
-//import com.yunfeiyun.agmp.iotm.device.qxsqz.domain.QxzDataLast24hDto;
-//import com.yunfeiyun.agmp.iotm.util.MongoUtil;
-//import com.yunfeiyun.agmp.iotm.web.service.IIotCmdtaskService;
-//import com.yunfeiyun.agmp.iotm.web.service.IIotDeviceService;
-//import com.yunfeiyun.agmp.iotm.web.service.IIotDeviceconfigService;
-//import com.yunfeiyun.agmp.iotm.web.service.IIotDevicefactorService;
-//import lombok.extern.slf4j.Slf4j;
-//import org.springframework.beans.BeanUtils;
-//import org.springframework.beans.factory.annotation.Autowired;
-//import org.springframework.data.domain.Sort;
-//import org.springframework.data.mongodb.core.aggregation.*;
-//import org.springframework.data.mongodb.core.query.Criteria;
-//import org.springframework.stereotype.Service;
-//
-//import javax.annotation.Resource;
-//import java.text.ParseException;
-//import java.util.*;
-//
-//@Service(value = ServiceNameConst.SERVICE_YF_QXZ)
-//@Slf4j
-//public class IotYfQxzServiceImplbackup extends IotDeviceBaseServiceImpl implements IotDeviceBaseService {
-//
-//    @Autowired
-//    private MongoService mongoService;
-//
-//    @Autowired
-//    private IIotDevicefactorService iotDevicefactorService;
-//
-//    @Autowired
-//    private IIotDeviceService iotDeviceService;
-//
-//    @Autowired
-//    private RedisCacheManager redisCacheManager;
-//
-//    @Autowired
-//    private IIotCmdtaskService iIotCmdtaskService;
-//
-//    @Resource
-//    private IIotDeviceconfigService iIotDeviceconfigService;
-//
-//    public TableDataInfo dataList(IotDeviceQxzDataListReqVo reqVo) throws ParseException {
-//        return dataList(reqVo, true, false);
-//    }
-//
-//    /**
-//     * 获取数据列表接口
-//     * @param reqVo
-//     */
-//    public TableDataInfo dataList(IotDeviceQxzDataListReqVo reqVo, boolean isNow, boolean isDisable) throws ParseException {
-//        TableDataInfo rspData = new TableDataInfo();
-//        rspData.setCode(ErrorCode.SUCCESS.getCode());
-//        rspData.setMsg(ErrorCode.SUCCESS.getMessage());
-//        rspData.setData(new ArrayList<>());
-//        rspData.setTotal(0);
-//
-//        IotDevice findDevice = iotDeviceService.selectIotDeviceByDevBid(reqVo.getDevBid());
-//
-//        String devBid = findDevice.getDevBid();
-//        Criteria criteria = new Criteria().and("devBid").is(devBid);
-//        if(isNow){
-//            Date startDate = null;
-//            Date endDate = null;
-//            try{
-//                startDate = DateUtils.dateTime(DateUtils.YYYY_MM_DD_HH_MM_SS, reqVo.getStartTime());
-//                endDate = DateUtils.dateTime(DateUtils.YYYY_MM_DD_HH_MM_SS, reqVo.getEndTime());
-//            }catch (Exception e){
-//                log.error("时间格式错误", e);
-//                throw new IotBizException(ErrorCode.INVALID_PARAMETER.getCode(), "请输入正确的起止时间");
-//            }
-//            criteria = criteria.andOperator(
-//                    Criteria.where("time").gte(startDate),
-//                    Criteria.where("time").lte(endDate)
-//            );
-//        }
-//
-//        MatchOperation matchOperation = Aggregation.match(criteria);
-//
-//        GroupOperation groupOperation = Aggregation.group("time")
-//                .push("$$ROOT").as("data");
-//
-//        ProjectionOperation projectionOperationResult = Aggregation.project("_id")
-//                .and("_id").as("time")
-//                .and("data").as("dataList");
-//
-//        SortOperation sortOperation = Aggregation.sort(Sort.Direction.DESC, "time");
-//
-//        Aggregation aggregation = Aggregation.newAggregation(
-//                matchOperation,
-//                groupOperation,
-//                projectionOperationResult,
-//                sortOperation
-//        );
-//
-//        PageDomain pageDomain = TableSupport.buildPageRequest();
-//        IPage<QxzDataListDto> qxzDataListDtoIPage = mongoService.aggregate(IotYfqxzdata.class, aggregation, QxzDataListDto.class, pageDomain);
-//        //查出该设备的“自定义要素信息列表”
-//        IotDevicefactor param = new IotDevicefactor();
-//        param.setDevBid(devBid);
-//        List<IotDevicefactor> factorList = iotDevicefactorService.selectIotDevicefactorList(param);
-//
-//        List<List<IotQxzDataListRseVo>> rest = new ArrayList<>();
-//        for(QxzDataListDto item: qxzDataListDtoIPage.getRecords()){
-//            List<QxzDataDto> dataList = item.getDataList();
-//            List<IotQxzDataListRseVo> iotQxzDataListRseVoList = ElementFactorUtil.qxzListProcessData(dataList, factorList, findDevice, isDisable);
-//            rest.add(iotQxzDataListRseVoList);
-//        }
-//        rspData.setData(rest);
-//        rspData.setTotal(qxzDataListDtoIPage.getTotal());
-//        return rspData;
-//    }
-//
-//    /**
-//     * 获取折线图数据列表接口
-//     * @param reqVo
-//     */
-//    public List<IotQxzDataListRseVo> chartList(IotDeviceQxzDataListReqVo reqVo) throws ParseException {
-//
-//        //1、查出总条数 2、查出“符合条件的、当前页的”数据 3、json结构重组（如果需要的话） 4、附加 要素自定义 信息
-//
-//        String devBid = reqVo.getDevBid();
-//        if(StringUtils.isEmpty(devBid)){
-//            throw new IotBizException(IotErrorCode.INVALID_DEVICE_ID.getCode(), "设备标识不能为空");
-//        }
-//
-//        IotDevice findDevice = iotDeviceService.selectIotDeviceByDevBid(reqVo.getDevBid());
-//
-//        String startDate = reqVo.getStartTime();
-//        String endDate = reqVo.getEndTime();
-//        String unit = "day";
-//
-//        Criteria criteria = new Criteria().and("devBid").is(devBid);
-//
-//        //必须设置起止时间
-//        if(StringUtils.isNotEmpty(startDate) && StringUtils.isNotEmpty(endDate)){
-//            //限制 起止时间
-//            criteria = criteria.andOperator(
-//                    Criteria.where("time").gte(DateUtils.parseDate(startDate)),
-//                    Criteria.where("time").lte(DateUtils.parseDate(endDate))
-//            );
-//            //选择 数据粒度
-//            unit = MongoUtil.getDateTruncUnit(startDate, endDate);
-//        }
-//
-//        MatchOperation matchOperation = Aggregation.match(criteria);
-//
-//        ProjectionOperation projectionOperation = Aggregation.project()
-//                .and("eName").as("eName")
-//                .and("eNum").as("eNum")
-//                .and("eKey").as("eKey")
-//                .andExpression("{$convert: {input: '$eValue', to: 'double', onError: -99, onNull: -99}}").as("eValue")
-//                .andExpression("{$dateTrunc: {date: {$toDate: '$time'}, unit:'" + unit + "'}}").as("time");
-//
-//        GroupOperation groupOperation = Aggregation.group("eName", "eNum", "eKey")
-//                .push("$$ROOT").as("data");
-//
-//        UnwindOperation unwindOperation = Aggregation.unwind("$data");
-//        GroupOperation groupOperation2 = Aggregation.group("data.eName", "data.eNum", "data.eKey", "data.time")
-//                .avg("data.eValue").as("eValue");
-//
-//        SortOperation sortOperation = Aggregation.sort(Sort.Direction.ASC, "_id.time");
-//        JSONArray roundArray = new JSONArray();
-//        roundArray.add("$eValue");
-//        roundArray.add(2);
-//        Map<String, Object> roundMap = new HashMap<>();
-//        roundMap.put("$round", roundArray);
-//        Map<String, Object> pushMapStr = new HashMap<>();
-//        pushMapStr.put("$toString", roundMap);
-//
-//        Map<String, Object> pushMap = new HashMap<>();
-//        pushMap.put("number", pushMapStr);
-//        pushMap.put("time", "$_id.time");
-//
-//        GroupOperation groupOperation3 = Aggregation.group("_id.eName", "_id.eNum", "_id.eKey")
-//                .push(pushMap).as("dataList");
-//
-//        ProjectionOperation projectionOperation2 = Aggregation.project()
-//                .and("eName").as("eName")
-//                .and("eNum").as("eNum")
-//                .and("eKey").as("eKey")
-//                .and("dataList").as("dataList");
-//        SortOperation sortOperation2 = Aggregation.sort(Sort.Direction.ASC, "eKey");
-//
-//        Aggregation aggregation = Aggregation.newAggregation(
-//                matchOperation,
-//                projectionOperation,
-//                groupOperation,
-//                unwindOperation,
-//                groupOperation2,
-//                sortOperation,
-//                groupOperation3,
-//                projectionOperation2,
-//                sortOperation2
-//        );
-//        List<QxzDataDto> dataList = mongoService.aggregate(IotYfqxzdata.class, aggregation, QxzDataDto.class);
-//
-//        //查出该设备的“自定义要素信息列表”
-//        IotDevicefactor param = new IotDevicefactor();
-//        param.setDevBid(devBid);
-//        List<IotDevicefactor> factorList = iotDevicefactorService.selectIotDevicefactorList(param);
-//        List<IotQxzDataListRseVo> iotQxzDataListRseVoList = ElementFactorUtil.qxzChartProcessData(dataList, factorList, findDevice, false);
-//        return iotQxzDataListRseVoList;
-//    }
-//
-//    /**
-//     * 获取24小时数据列表接口
-//     * @param reqVo
-//     * @return
-//     */
-//    public List<IotQxzDataListRseVo> dataList24h(IotDeviceQxzDataListReqVo reqVo){
-//        String devBid = reqVo.getDevBid();
-//        long endTime = DateUtils.dateTime(DateUtils.YYYY_MM_DD_HH_MM_SS, DateUtils.dateNow()).getTime();
-//        long begintime = endTime-86400000;
-//
-//        IotDevice findDevice = iotDeviceService.selectIotDeviceByDevBid(reqVo.getDevBid());
-//
-//        Criteria criteria = new Criteria().and("devBid").is(devBid);
-//        criteria = criteria.andOperator(
-//                Criteria.where("time").gte(new Date(begintime)),
-//                Criteria.where("time").lte(new Date(endTime))
-//        );
-//        MatchOperation matchOperation = Aggregation.match(criteria);
-//        AddFieldsOperation addFieldsOperation = Aggregation.addFields()
-//                .addField("eValueNum")
-//                .withValueOfExpression("{$convert: {input: '$eValue', to: 'double', onError: -99, onNull: -99}}")
-//                .build();
-//
-//        SortOperation sortOperation = Aggregation.sort(Sort.Direction.ASC, "eValueNum");
-//
-//        GroupOperation groupOperation = Aggregation.group("eNum", "eName", "eKey")
-//                .push("$$ROOT").as("data");
-//        SortOperation sortOperation2 = Aggregation.sort(Sort.Direction.ASC, "data.eValueNum")
-//                .and(Sort.Direction.ASC, "data.time");
-//
-//        ProjectionOperation projectionOperationResult = Aggregation.project("_id")
-//                .and("_id").as("elem")
-//                .andExpression("{$last: '$data'}").as("max_data")
-//                .andExpression("{$first: '$data'}").as("min_data");
-//
-//        ProjectionOperation projectionOperationResult2 = Aggregation.project("_id")
-//                .and("elem").as("elem")
-//                .and("elem.eNum").as("eNum")
-//                .and("elem.eName").as("eName")
-//                .and("elem.eKey").as("eKey")
-//                .and("max_data.eValue").as("maxVal")
-//                .and("max_data.time").as("maxValdate")
-//                .and("min_data.eValue").as("minVal")
-//                .and("min_data.time").as("minValdate");
-//
-//        SortOperation sortOperation3 = Aggregation.sort(Sort.Direction.ASC, "eNum")
-//                .and(Sort.Direction.ASC, "eName")
-//                .and(Sort.Direction.ASC, "eKey");
-//
-//        Aggregation aggregation = Aggregation.newAggregation(
-//                matchOperation,
-//                addFieldsOperation,
-//                sortOperation,
-//                groupOperation,
-//                sortOperation2,
-//                projectionOperationResult,
-//                projectionOperationResult2,
-//                sortOperation3
-//        );
-//
-//        List<QxzDataLast24hDto> qxzDataLast24hDtoList = mongoService.aggregate(IotYfqxzdata.class, aggregation, QxzDataLast24hDto.class);
-//        //查出该设备的“自定义要素信息列表”
-//        IotDevicefactor param = new IotDevicefactor();
-//        param.setDevBid(devBid);
-//        List<IotDevicefactor> factorList = iotDevicefactorService.selectIotDevicefactorList(param);
-//        Map<String, QxzDataLast24hDto> iotXphLast24hDtoMap = new HashMap<>();
-//        List<QxzDataDto> dataList = new ArrayList<>();
-//        for(QxzDataLast24hDto item: qxzDataLast24hDtoList){
-//            String key = ElementFactorUtil.getAddress(item.getEName(), item.getEKey());
-//            iotXphLast24hDtoMap.put(key, item);
-//            QxzDataDto dto = new QxzDataDto();
-//            BeanUtils.copyProperties(item, dto);
-//            dataList.add(dto);
-//        }
-//
-//        List<IotQxzDataListRseVo> iotQxzDataListRseVoList = ElementFactorUtil.qxzListProcessData(dataList, factorList, findDevice, false);
-//        for(IotQxzDataListRseVo item: iotQxzDataListRseVoList){
-//            QxzDataLast24hDto qxzDataLast24hDto = iotXphLast24hDtoMap.get(item.getAddress());
-//            item.setMinVal(qxzDataLast24hDto.getMinVal());
-//            item.setMinValdate(DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS, qxzDataLast24hDto.getMinValdate()));
-//            item.setMaxVal(qxzDataLast24hDto.getMaxVal());
-//            item.setMaxValdate(DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS, qxzDataLast24hDto.getMaxValdate()));
-//        }
-//        return iotQxzDataListRseVoList;
-//    }
-//
-//    /**
-//     * 获取最近数据列表接口
-//     * @param reqVo
-//     * @return
-//     */
-//    public IotDevicelasteddata dataLatest(IotDeviceQxzDataListReqVo reqVo) throws ParseException {
-//        String devBid = reqVo.getDevBid();
-//
-//        IotDevice findDevice = iotDeviceService.selectIotDeviceByDevBid(reqVo.getDevBid());
-//        TableDataInfo tableDataInfo = dataList(reqVo, false, true);
-//        List<List<IotQxzDataListRseVo>> rest = (List<List<IotQxzDataListRseVo>>) tableDataInfo.getData();
-//        if(rest == null || rest.isEmpty()){
-//            log.info("devBid:{},【最近数据】empty",devBid);
-//            return null;
-//        }
-//
-//        List<IotQxzDataListRseVo> iotQxzDataListRseVoList = rest.get(0);
-//        IotQxzDataListRseVo iotQxzDataListRseVo = iotQxzDataListRseVoList.get(0);
-//        IotDevicelasteddata latestData = new IotDevicelasteddata();
-//        BeanUtils.copyProperties(findDevice, latestData);
-//        latestData.setDevldCreateddate(iotQxzDataListRseVo.getTime());
-//        latestData.setDevldUpdateddate(iotQxzDataListRseVo.getTime());
-//        latestData.setDevldContent(JSONArray.toJSONString(iotQxzDataListRseVoList));
-//        return latestData;
-//    }
-//
-//    /**
-//     * 刷新指令集
-//     * @param reqVo
-//     */
-//    public void refresh(DeviceRefreshDto reqVo) {
-//
-//        IotDevice findDevice = reqVo.getIotDevice();
-//        String devBid = findDevice.getDevBid();
-//        log.info("创建【“刷新”指令集任务】，设备类型：{}", findDevice.getDevtypeName());
-//        JSONObject ext = new JSONObject();
-//        ext.put("type", "data");
-//        JSONObject payload = new JSONObject();
-//        payload.put("cmd", "read");
-//        payload.put("ext", ext);
-//        IotDeviceconfig iotDeviceconfig = new IotDeviceconfig();
-//        iotDeviceconfig.setTid(findDevice.getTid());
-//        iotDeviceconfig.setDevBid(devBid);
-//        iotDeviceconfig.setDevcfgContext(JSONUtils.toJSONString(payload));
-//
-//        CmdGroupModel cmdGroupModel = iIotDeviceconfigService.createRefreshCmd(iotDeviceconfig);
-//
-//        // 构建日志需要用的内容
-//        cmdGroupModel.setRequestId(IdUtils.fastUUID());
-//        cmdGroupModel.setDevCode(findDevice.getDevCode());
-//        cmdGroupModel.setCtBiztype("3");
-//        cmdGroupModel.setCtDevtype(findDevice.getDevtypeBid());
-//        cmdGroupModel.setCtBiztitle(findDevice.getDevtypeName() + "：" + findDevice.getDevCode());
-//        cmdGroupModel.setCtParam("设备id："+devBid);
-//        iIotCmdtaskService.handInternalCmd(cmdGroupModel);
-//        String taskUuid = cmdGroupModel.getTaskUuid();
-//        log.info("【“刷新”指令集任务】创建成功，taskUuid：{}", taskUuid);
-//    }
-//
-//
-//}

src/main/java/com/yunfeiyun/agmp/iotm/device/scd/controller/IotDeviceScdController.java

@@ -0,0 +1,110 @@
+package com.yunfeiyun.agmp.iotm.device.scd.controller;
+
+import com.yunfeiyun.agmp.common.constant.ErrorCode;
+import com.yunfeiyun.agmp.common.core.domain.AjaxResult;
+import com.yunfeiyun.agmp.common.core.page.TableDataInfo;
+import com.yunfeiyun.agmp.iot.common.constant.devicetype.IotDeviceDictConst;
+import com.yunfeiyun.agmp.iotm.common.controller.BaseController;
+import com.yunfeiyun.agmp.iotm.device.common.domin.IotDeviceBaseFunReqVo;
+import com.yunfeiyun.agmp.iotm.device.common.service.IotDeviceCommonService;
+import com.yunfeiyun.agmp.iotm.device.common.service.IotDeviceRefreshService;
+import com.yunfeiyun.agmp.iotm.device.qxsqz.domain.IotDeviceQxzDataListReqVo;
+import com.yunfeiyun.agmp.iotm.web.domain.reqvo.IotDeviceListReqVo;
+import com.yunfeiyun.agmp.iotm.web.domain.resvo.IotDeviceListResVo;
+import com.yunfeiyun.agmp.iotm.web.service.IIotDeviceService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+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 javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * 杀虫灯设备控制器
+ */
+
+@RestController
+@RequestMapping("/iot/device/scd")
+@Slf4j
+public class IotDeviceScdController extends BaseController {
+    @Autowired
+    private IIotDeviceService iIotDeviceService;
+
+    @Resource
+    private IotDeviceCommonService iotDeviceCommonService;
+
+    @Resource
+    private IotDeviceRefreshService iotDeviceRefreshService;
+
+    /**
+     * 杀虫灯列表
+     * /list  所有杀虫灯设备
+     * /pt/list 普通杀虫灯设备
+     * /fxs/list 风吸式杀虫灯设备
+     * /jgs/list 景观式杀虫灯设备
+     * @param reqVo
+     * @return
+     */
+    @GetMapping({"/list", "/pt/list", "/fxs/list", "/jgs/list"})
+    public TableDataInfo list(HttpServletRequest request, IotDeviceListReqVo reqVo) {
+        startPage();
+        String reqUri = request.getRequestURI();
+        String[] devTypeList = new String[]{
+                IotDeviceDictConst.TYPE_YF_SCD,
+                IotDeviceDictConst.TYPE_YF_FXSSCD,
+                IotDeviceDictConst.TYPE_YF_JGFXSSCD
+        };
+
+        if(reqUri.endsWith("/pt/list")){
+            devTypeList = new String[]{IotDeviceDictConst.TYPE_YF_SCD};
+        }else if(reqUri.endsWith("/fxs/list")){
+            devTypeList = new String[]{IotDeviceDictConst.TYPE_YF_FXSSCD};
+        } else if (reqUri.endsWith("/jgs/list")) {
+            devTypeList = new String[]{IotDeviceDictConst.TYPE_YF_JGFXSSCD};
+        }
+        reqVo.setDevtypeBidList(Arrays.asList(devTypeList));
+        List<IotDeviceListResVo> list = iIotDeviceService.selectIotDeviceListByType(reqVo);
+        return getDataTable(list);
+    }
+
+    /**
+     * 数据列表
+     * @param reqVo
+     * @return
+     */
+    @GetMapping("/data/list")
+    public TableDataInfo dataList(IotDeviceQxzDataListReqVo reqVo) {
+        IotDeviceBaseFunReqVo iotDeviceBaseFunReqVo = new IotDeviceBaseFunReqVo();
+        iotDeviceBaseFunReqVo.setDevBid(reqVo.getDevBid());
+        iotDeviceBaseFunReqVo.setMethodName("dataList");
+        iotDeviceBaseFunReqVo.setParam(reqVo);
+        return iotDeviceCommonService.func(iotDeviceBaseFunReqVo);
+    }
+
+    /**
+     * 折线图列表
+     * @param reqVo
+     * @return
+     */
+    @GetMapping("/chart/list")
+    public AjaxResult chartList(IotDeviceQxzDataListReqVo reqVo) {
+        IotDeviceBaseFunReqVo iotDeviceBaseFunReqVo = new IotDeviceBaseFunReqVo();
+        iotDeviceBaseFunReqVo.setDevBid(reqVo.getDevBid());
+        iotDeviceBaseFunReqVo.setMethodName("chartList");
+        iotDeviceBaseFunReqVo.setParam(reqVo);
+        List<IotDeviceListResVo> list = iotDeviceCommonService.func(iotDeviceBaseFunReqVo);
+        return AjaxResult.success(list);
+    }
+
+    @GetMapping("/refresh/{devBid}")
+    public AjaxResult refresh(@PathVariable("devBid") String devBid) {
+        String result = iotDeviceRefreshService.refresh(devBid);
+        return new AjaxResult(ErrorCode.SUCCESS.getCode(), result, null);
+    }
+
+}

src/main/java/com/yunfeiyun/agmp/iotm/device/scd/domain/IotYfScdPolylineResVo.java

@@ -0,0 +1,16 @@
+package com.yunfeiyun.agmp.iotm.device.scd.domain;
+
+import lombok.Data;
+
+/**
+ * 杀虫灯折线图数据
+ */
+@Data
+public class IotYfScdPolylineResVo {
+    private String ah;
+    private String at;
+    private String bv;
+    private String cv;
+    private String ct;
+    private String createDate;
+}

src/main/java/com/yunfeiyun/agmp/iotm/device/scd/service/IIotScdCommService.java

@@ -0,0 +1,12 @@
+package com.yunfeiyun.agmp.iotm.device.scd.service;
+
+import com.yunfeiyun.agmp.iotm.device.common.service.IotDeviceBaseService;
+import com.yunfeiyun.agmp.iotm.device.common.service.impl.IotDeviceBaseServiceImpl;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+@Service
+@Slf4j
+public class IIotScdCommService extends IotDeviceBaseServiceImpl implements IotDeviceBaseService {
+
+}

src/main/java/com/yunfeiyun/agmp/iotm/device/scd/service/impl/IotYfScdServiceImpl.java

@@ -0,0 +1,228 @@
+package com.yunfeiyun.agmp.iotm.device.scd.service.impl;
+
+import com.alibaba.fastjson2.JSONObject;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yunfeiyun.agmp.common.constant.ErrorCode;
+import com.yunfeiyun.agmp.common.core.page.PageDomain;
+import com.yunfeiyun.agmp.common.core.page.TableDataInfo;
+import com.yunfeiyun.agmp.common.core.page.TableSupport;
+import com.yunfeiyun.agmp.common.utils.JSONUtils;
+import com.yunfeiyun.agmp.common.utils.StringUtils;
+import com.yunfeiyun.agmp.common.utils.uuid.IdUtils;
+import com.yunfeiyun.agmp.iot.common.constant.IotErrorCode;
+import com.yunfeiyun.agmp.iot.common.constant.devicetype.ServiceNameConst;
+import com.yunfeiyun.agmp.iot.common.domain.IotDevice;
+import com.yunfeiyun.agmp.iot.common.domain.IotDeviceconfig;
+import com.yunfeiyun.agmp.iot.common.domain.IotYfScddata;
+import com.yunfeiyun.agmp.iot.common.exception.IotBizException;
+import com.yunfeiyun.agmp.iot.common.model.cmd.CmdGroupModel;
+import com.yunfeiyun.agmp.iot.common.service.MongoService;
+import com.yunfeiyun.agmp.iotm.device.common.domin.DeviceRefreshDto;
+import com.yunfeiyun.agmp.iotm.device.qxsqz.domain.IotDeviceQxzDataListReqVo;
+import com.yunfeiyun.agmp.iotm.device.scd.domain.IotYfScdPolylineResVo;
+import com.yunfeiyun.agmp.iotm.device.scd.service.IIotScdCommService;
+import com.yunfeiyun.agmp.iotm.util.MongoUtil;
+import com.yunfeiyun.agmp.iotm.web.service.IIotCmdtaskService;
+import com.yunfeiyun.agmp.iotm.web.service.IIotDeviceService;
+import com.yunfeiyun.agmp.iotm.web.service.IIotDeviceconfigService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Sort;
+import org.springframework.data.mongodb.core.aggregation.*;
+import org.springframework.data.mongodb.core.query.Criteria;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.text.ParseException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@Service(value = ServiceNameConst.SERVICE_YF_SCD)
+@Slf4j
+public class IotYfScdServiceImpl extends IIotScdCommService {
+    @Autowired
+    private IIotDeviceService iotDeviceService;
+
+    @Autowired
+    private MongoService mongoService;
+
+    @Autowired
+    private IIotCmdtaskService iIotCmdtaskService;
+
+    @Resource
+    private IIotDeviceconfigService iIotDeviceconfigService;
+
+    /**
+     * 获取数据列表接口
+     *
+     */
+    public TableDataInfo dataList(IotDeviceQxzDataListReqVo reqVo) throws ParseException {
+        TableDataInfo rspData = new TableDataInfo();
+        rspData.setCode(ErrorCode.SUCCESS.getCode());
+        rspData.setMsg(ErrorCode.SUCCESS.getMessage());
+        rspData.setData(new ArrayList<>());
+        rspData.setTotal(0);
+
+        IotDevice findDevice = iotDeviceService.selectIotDeviceByDevBid(reqVo.getDevBid());
+        if(findDevice == null){
+            throw new IotBizException(ErrorCode.INVALID_PARAMETER.getCode(), "设备不存在");
+        }
+        String startTime = reqVo.getStartTime();
+        String endTime = reqVo.getEndTime();
+        if(startTime == null || endTime == null){
+            throw new IotBizException(ErrorCode.INVALID_PARAMETER.getCode(), "请输入正确的起止时间");
+        }
+
+        Map<String, Object> cases = new HashMap<>();
+        cases.put("devBid", reqVo.getDevBid());
+        cases.put("time_scddataCreatedDate", startTime + "," + endTime);
+
+        PageDomain pageDomain = TableSupport.buildPageRequest();
+        IPage<IotYfScddata> iotYfScddataIPage = mongoService.findListPage(IotYfScddata.class, cases, pageDomain);
+        rspData.setData(iotYfScddataIPage.getRecords());
+        rspData.setTotal(iotYfScddataIPage.getTotal());
+        return rspData;
+    }
+
+    /**
+     * 获取折线图数据列表接口
+     * @param reqVo
+     */
+    public List<IotYfScdPolylineResVo> chartList(IotDeviceQxzDataListReqVo reqVo) throws ParseException {
+        String devBid = reqVo.getDevBid();
+        if (StringUtils.isEmpty(devBid)) {
+            throw new IotBizException(IotErrorCode.INVALID_DEVICE_ID.getCode(), "设备标识不能为空");
+        }
+        String startDate = reqVo.getStartTime();
+        String endDate = reqVo.getEndTime();
+        if (StringUtils.isEmpty(startDate) && StringUtils.isEmpty(endDate)) {
+            throw new IotBizException(IotErrorCode.PARAM_INVALID.getCode(), "请输入正确的起止时间");
+        }
+
+        String unit = MongoUtil.getDateTruncUnit(startDate, endDate);
+        Criteria criteria = new Criteria().and("devBid").is(devBid);
+        criteria = criteria.andOperator(
+                Criteria.where("scddataCreatedDate").gte(startDate),
+                Criteria.where("scddataCreatedDate").lte(endDate)
+        );
+
+        /**
+         * $mtch {"devBid": devBid, "$add": [{"scddataCreatedDate": {"$gte": startDate}}, {"scddataCreatedDate": {"$lte": endDate}}]}
+         */
+        MatchOperation matchOperation = Aggregation.match(criteria);
+
+        /**
+         * $project
+         *      {
+         *          "ah": "$scddataContent.ah",
+         *          "createDate": "$scddataCreatedDate"
+         *      }
+         */
+        ProjectionOperation projectionOperation = Aggregation.project()
+                .and("scddataContent.ah").as("ah")
+                .and("scddataContent.at").as("at")
+                .and("scddataContent.bv").as("bv")
+                .and("scddataContent.cv").as("cv")
+                .and("scddataContent.ct").as("ct")
+                .and("scddataCreatedDate").as("createDate");
+        /**
+         * $project
+         *      {
+         *          "at": {$convert: {input: '$at', to: 'double', onError: -99, onNull: -99}},
+         *          "createDate": {$dateTrunc: {date: {$toDate: '$createDate'}, unit: 'minute'}}
+         *      }
+         */
+
+        ProjectionOperation projectionOperation2 = Aggregation.project()
+                .andExpression("{$convert: {input: '$ct', to: 'int', onError: -99, onNull: -99}}").as("ct")
+                .andExpression("{$convert: {input: '$at', to: 'double', onError: -99, onNull: -99}}").as("at")
+                .andExpression("{$convert: {input: '$ah', to: 'double', onError: -99, onNull: -99}}").as("ah")
+                .andExpression("{$convert: {input: '$bv', to: 'double', onError: -99, onNull: -99}}").as("bv")
+                .andExpression("{$convert: {input: '$cv', to: 'double', onError: -99, onNull: -99}}").as("cv")
+                .andExpression("{$dateTrunc: {date: {$toDate: '$createDate'}, unit:'" + unit + "'}}").as("createDate");
+
+        Criteria criteria2 = new Criteria()
+                .and("at").gt(-99)
+                .and("ah").gt(-99)
+                .and("bv").gt(-99)
+                .and("cv").gt(-99)
+                .and("ct").gt(-99);
+        MatchOperation matchOperation2 = Aggregation.match(criteria2);
+
+        /**
+         * {
+         *    "$group" : {
+         *       "_id" : "$createDate", "ah" : { "$avg" : "$ah"}, "at" : { "$avg" : "$at"}, "bv" : { "$avg" : "$bv"}, "cv" : { "$avg" : "$cv"}, "ct" : { "$sum" : "$ct"}
+         *    }
+         * }
+         */
+        GroupOperation groupOperation = Aggregation.group("createDate")
+                .avg("ah").as("ah")
+                .avg("at").as("at")
+                .avg("bv").as("bv")
+                .avg("cv").as("cv")
+                .sum("ct").as("ct");
+
+        /**
+         * { "$project" : { "ct" : 1, "bv" : { "$trunc" : ["$bv", 3]}, "createDate" : { "$dateToString" : { "format" : "%Y-%m-%d %H:%M:%S", "date" : "$_id"}}}}
+         */
+        ProjectionOperation projectionOperation3 = Aggregation.project("ct")
+                .andExpression("{$trunc: {'$bv', 3}}").as("bv")
+                .andExpression("{$trunc: {'$cv', 3}}").as("cv")
+                .andExpression("{$trunc: {'$ah', 1}}").as("ah")
+                .andExpression("{$trunc: {'$at', 1}}").as("at")
+                .andExpression("{$dateToString: {format: '%Y-%m-%d %H:%M:%S', date: '$_id'}}").as("createDate");
+
+        /**
+         * { "$sort" : { "createDate" : 1}}
+         */
+        SortOperation sortOperation = Aggregation.sort(Sort.Direction.ASC, "createDate");
+
+        Aggregation aggregation = Aggregation.newAggregation(
+                matchOperation,
+                projectionOperation,
+                projectionOperation2,
+                matchOperation2,
+                groupOperation,
+                projectionOperation3,
+                sortOperation
+        );
+        List<IotYfScdPolylineResVo> iotYfScdPolylineResVoList = mongoService.aggregate(
+                IotYfScddata.class, aggregation, IotYfScdPolylineResVo.class
+        );
+        return iotYfScdPolylineResVoList;
+    }
+
+    /**
+     * 刷新指令集
+     * @param reqVo
+     */
+    public void refresh(DeviceRefreshDto reqVo) {
+
+        IotDevice findDevice = reqVo.getIotDevice();
+        String devBid = findDevice.getDevBid();
+        log.info("创建【“刷新”指令集任务】，设备类型：{}", findDevice.getDevtypeName());
+        JSONObject payload = new JSONObject();
+        payload.put("cmd", "read");
+        payload.put("ext", "data");
+        IotDeviceconfig iotDeviceconfig = new IotDeviceconfig();
+        iotDeviceconfig.setTid(findDevice.getTid());
+        iotDeviceconfig.setDevBid(devBid);
+        iotDeviceconfig.setDevcfgContext(JSONUtils.toJSONString(payload));
+
+        CmdGroupModel cmdGroupModel = iIotDeviceconfigService.createRefreshCmd(iotDeviceconfig);
+
+        // 构建日志需要用的内容
+        cmdGroupModel.setRequestId(IdUtils.fastUUID());
+        cmdGroupModel.setDevCode(findDevice.getDevCode());
+        cmdGroupModel.setCtBiztype("3");
+        cmdGroupModel.setCtDevtype(findDevice.getDevtypeBid());
+        cmdGroupModel.setCtBiztitle(findDevice.getDevtypeName() + "：" + findDevice.getDevCode());
+        cmdGroupModel.setCtParam("设备id："+devBid);
+        iIotCmdtaskService.handInternalCmd(cmdGroupModel);
+        String taskUuid = cmdGroupModel.getTaskUuid();
+        log.info("【“刷新”指令集任务】创建成功，taskUuid：{}", taskUuid);
+    }
+}