chore:补充提交

jinpengyong

2023-10-31 69790994b403a61e92a20cef7451b7f087b50ad2

chore:补充提交

 screen-api/src/main/java/com/moral/api/controller/AllocationController.java

@@ -20,11 +20,12 @@
import io.swagger.annotations.*;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.ObjectUtils;

import org.springframework.web.bind.annotation.*;

import java.lang.reflect.Field;
import java.util.ArrayList;
import java.util.HashMap;

import java.util.List;
import java.util.Map;

@@ -39,7 +40,9 @@
import com.moral.api.utils.NoModelWriteData;
import com.moral.constant.Constants;
import com.moral.constant.ResultMessage;
import com.moral.util.DateUtils;
import com.moral.util.WebUtils;


import javax.validation.Valid;

@@ -134,6 +137,7 @@
        allocationVo.setFileChangeList(allocationext.getFileChangeList());
        allocationVo.setFileApproveList(allocationext.getFileApproveList());
        allocationVo.setApproveList(allocationext.getApproveList());
        allocationVo.setTime(DateUtils.dateToDateString(allocationVo.getEscalationTime(), DateUtils.yyyy_MM_dd_CN));
        return ResultMessage.ok(allocationVo);
    }
    @GetMapping("remove")

 screen-api/src/main/java/com/moral/api/controller/AppDevicController.java

@@ -15,8 +15,10 @@
import java.util.List;

import com.moral.api.entity.Device;
import com.moral.api.entity.MonitorPoint;
import com.moral.api.entity.Organization;
import com.moral.api.service.DeviceService;
import com.moral.api.service.MonitorPointService;
import com.moral.api.service.OrganizationService;
import com.moral.constant.ResponseCodeEnum;
import com.moral.constant.ResultMessage;
@@ -29,7 +31,7 @@
public class AppDevicController {

    @Autowired
    private OrganizationService organizationService;
    private MonitorPointService monitorPointService;

    @Autowired
    private DeviceService deviceService;
@@ -37,17 +39,17 @@


    @GetMapping("selectOrganization")
    @ApiOperation(value = "小程序获取组织")
    @ApiOperation(value = "小程序获取站点")
    public ResultMessage selectOrganization(){
        List<Organization> organizations = organizationService.getOrganizations();
        return ResultMessage.ok(organizations);
        List<MonitorPoint> monitorPoints = monitorPointService.getOrganizations();
        return ResultMessage.ok(monitorPoints);
    }


    @GetMapping("selectDevice")
    @ApiOperation(value = "小程序获取设备")
    public ResultMessage selectDevice(@RequestParam @ApiParam(value = "organizationId",name = "组织ID") Integer organizationId){
        List<Device> organizationDevice = deviceService.getOrganizationDevice(organizationId);
    public ResultMessage selectDevice(@RequestParam @ApiParam(value = "monitorPointId",name = "站点ID") Integer monitorPointId){
        List<Device> organizationDevice = deviceService.getOrganizationDevice(monitorPointId);
        return ResultMessage.ok(ObjectUtils.isEmpty(organizationDevice)?null:organizationDevice);
    }


 screen-api/src/main/java/com/moral/api/controller/AppUserController.java

@@ -5,7 +5,6 @@
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.codec.digest.DigestUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.GetMapping;
@@ -81,13 +80,15 @@
        //拼接推送的模版
        WxMssVo wxMssVo = new WxMssVo();
        wxMssVo.setTouser(openid);//用户的openid（要发送给那个用户，通常这里应该动态传进来的）
        wxMssVo.setTemplate_id("CFeSWarQLMPyPjwmiy6AV4eB-IZcipu48V8bFLkBzTU");//订阅消息模板id
        wxMssVo.setTemplate_id("sClgB85aEG1hgaiXpnJBopo5LJX6r91DUsyikOmUgv8");//订阅消息模板id
        wxMssVo.setPage("pages/index/index");

        Map<String, String> m = new HashMap<>(3);
        m.put("thing1", "小程序入门课程");
        m.put("thing6", "杭州浙江大学");
        m.put("time2", "2023-10-23");
        m.put("thing3", "七星");
        m.put("thing7", "第一章第一节");
        m.put("character_string8", "第一章第一节");
        m.put("phrase10", "第一章第一节");
        wxMssVo.setData(m);
        ResponseEntity<String> responseEntity =
                restTemplate.postForEntity(url, wxMssVo, String.class);

 screen-api/src/main/java/com/moral/api/mapper/MonitorPointMapper.java

@@ -1,5 +1,7 @@
package com.moral.api.mapper;

import java.util.List;

import com.moral.api.entity.MonitorPoint;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;

@@ -13,4 +15,6 @@
 */
public interface MonitorPointMapper extends BaseMapper<MonitorPoint> {

    List<Integer> getMonitorPointiId(Integer id);

}

 screen-api/src/main/java/com/moral/api/pojo/vo/allocation/AllocationVo.java

@@ -1,5 +1,6 @@
package com.moral.api.pojo.vo.allocation;

import com.baomidou.mybatisplus.annotation.TableField;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.moral.api.pojo.ext.allocation.AllocationExt;
import com.moral.api.pojo.vo.approvetable.ApproveTableListVo;
@@ -135,6 +136,9 @@
    @ApiModelProperty(value = "流程状态")
    private List<ApproveTableListVo> approveList;

    @TableField(exist = false)
    private String time;


    public static AllocationVo convert(AllocationExt allocationExt) {
        AllocationVo allocationVo = BeanConverts.convert(allocationExt, AllocationVo.class);

 screen-api/src/main/java/com/moral/api/service/DeviceService.java

@@ -59,7 +59,7 @@
    List<Device> getFuzzySearch(String mac);

    /**
     * 根据组织查询设备
     * 根据站点查询设备
     * @param id
     * @return
     */

 screen-api/src/main/java/com/moral/api/service/MonitorPointService.java

@@ -54,5 +54,12 @@

    List<MonitoringStationDTO> listMonitoringStationDTO(Map<String, Object> params, int reportType, String startTime, String endTime);

    /**
     * 根据用户查询站点
     * @return
     */

    List<MonitorPoint> getOrganizations();

}


 screen-api/src/main/java/com/moral/api/service/OrganizationService.java

@@ -33,12 +33,6 @@
            */
    Organization getOrganizationById(Integer id);

    /**
     * 根据用户查询组织
     * @return
     */

    List<Organization> getOrganizations();




 screen-api/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java

@@ -515,7 +515,7 @@
    }

    /**
     * 根据组织查询设备
     * 根据站点查询设备
     *
     * @param id
     * @return
@@ -523,7 +523,7 @@
    @Override
    public List<Device> getOrganizationDevice(Integer id) {
        LambdaQueryWrapper<Device> wrapper = new LambdaQueryWrapper<>();
        wrapper.eq(Device::getOrganizationId,id);
        wrapper.eq(Device::getMonitorPointId,id);
        wrapper.eq(Device::getIsDelete,Constants.NOT_DELETE);
        wrapper.orderByAsc(Device::getCreateTime);
        List<Device> devices = deviceMapper.selectList(wrapper);

 screen-api/src/main/java/com/moral/api/service/impl/MonitorPointServiceImpl.java

@@ -3,6 +3,7 @@
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
import com.moral.api.config.Interceptor.UserHelper;
import com.moral.api.dto.MonitoringStationDTO;
import com.moral.api.entity.*;
import com.moral.api.mapper.DeviceMapper;
@@ -10,6 +11,7 @@
import com.moral.api.mapper.MonitorPointMapper;
import com.moral.api.mapper.SensorMapper;
import com.moral.api.pojo.form.device.MonitorPointQueryForm;
import com.moral.api.pojo.vo.user.QxUser;
import com.moral.api.service.DeviceService;
import com.moral.api.service.HistoryDailyService;
import com.moral.api.service.HistoryHourlyService;
@@ -24,6 +26,7 @@
import org.apache.commons.collections4.CollectionUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.ObjectUtils;
import springfox.documentation.schema.Entry;

import java.math.BigDecimal;
@@ -518,6 +521,33 @@
        return resultList;
    }

    /**
     * 根据用户查询站点
     *
     * @return
     */
    @Override
    public List<MonitorPoint> getOrganizations() {
        QueryWrapper<MonitorPoint> wrapper = new QueryWrapper<>();
        wrapper.select("id","name");
        QxUser user = UserHelper.getCurrentUser();
        Integer organizationId = user.getOrganizationId();
        List<Integer> monitorPointiIds = monitorPointMapper.getMonitorPointiId(organizationId);
        if (organizationId!=24){
            wrapper.in("id",monitorPointiIds);
        }
        wrapper.eq("is_delete",Constants.NOT_DELETE);
        List<MonitorPoint> monitorPoints = monitorPointMapper.selectList(wrapper);
        for (int i = 0; i < monitorPoints.size(); i++) {
            List<Device> organizationDevice = deviceService.getOrganizationDevice(monitorPoints.get(i).getId());
            if (ObjectUtils.isEmpty(organizationDevice)){
                monitorPoints.remove(i);
                i--;
            }
        }
        return monitorPoints;
    }


    private List<MonitoringStationDTO> resultList(List<HistoryDaily> historyDailyByMacAndTimeSlot){
        List<MonitoringStationDTO> list = new ArrayList<>();

 screen-api/src/main/java/com/moral/api/service/impl/OrganizationServiceImpl.java

@@ -2,10 +2,13 @@

import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.moral.api.config.Interceptor.UserHelper;
import com.moral.api.entity.MonitorPoint;
import com.moral.api.entity.Organization;
import com.moral.api.mapper.MonitorPointMapper;
import com.moral.api.mapper.OrganizationMapper;
import com.moral.api.pojo.vo.user.QxUser;
import com.moral.api.service.DeviceService;
import com.moral.api.service.MonitorPointService;
import com.moral.api.service.OrganizationService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.moral.constant.Constants;
@@ -30,8 +33,6 @@
    @Autowired
    OrganizationMapper organizationMapper;

    @Autowired
    private DeviceService deviceService;


    @Override
@@ -46,31 +47,6 @@
        return organizationMapper.selectById(id);
    }

    /**
     * 根据用户查询组织
     *
     * @return
     */
    @Override
    public List<Organization> getOrganizations() {
        QueryWrapper<Organization> wrapper = new QueryWrapper<>();
        wrapper.select("id","name");
        QxUser user = UserHelper.getCurrentUser();
        Integer organizationId = user.getOrganizationId();
        if (organizationId!=24){
            wrapper.eq("id",user.getOrganizationId());
        }
            wrapper.eq("is_delete",Constants.NOT_DELETE);
        List<Organization> organizations = organizationMapper.selectList(wrapper);
        for (int i=0; i<organizations.size(); i++) {
            List<String> macs = deviceService.getMacsByOrganizationId(organizations.get(i).getId());
            if (ObjectUtils.isEmpty(macs)){
                organizations.remove(i);
                i--;
            }
        }
        return organizations;
    }


    /**

 screen-api/src/main/resources/mapper/MonitorPointMapper.xml

@@ -19,4 +19,10 @@
                    <result column="desc" property="desc" />
        </resultMap>



    <select id="getMonitorPointiId" resultType="java.lang.Integer">
        select id from monitor_point where  organization_id=#{id} and is_delete=0
    </select>

</mapper>