#

luxiaotao1123

2022-02-26 b164776bd12f2598b3d07662f7af9a82db29e6a1

#

 src/main/java/com/zy/sc/manager/controller/AppController.java

@@ -12,6 +12,8 @@
import com.zy.sc.common.service.GeoService;
import com.zy.sc.common.web.BaseController;
import com.zy.sc.manager.controller.param.MobileIssueParam;
import com.zy.sc.manager.controller.result.AppHostIssueVo;
import com.zy.sc.manager.controller.result.AppIssueVo;
import com.zy.sc.manager.entity.Issue;
import com.zy.sc.manager.entity.IssueType;
import com.zy.sc.manager.service.IssueService;
@@ -21,10 +23,10 @@
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;

import java.util.Date;
import java.util.List;
import java.util.*;

/**
 * Created by vincent on 2021/12/20
@@ -79,6 +81,9 @@
        if (Cools.isEmpty(param.getTel())) {
            return R.error("请输入联系方式");
        }
        if (!param.getTel().matches(REGEX_MOBILE)) {
            return R.error("请输入正确的手机号");
        }
        if (Cools.isEmpty(param.getTitle())) {
            return R.error("请输入问题概述");
        }
@@ -113,56 +118,49 @@
        }
        return R.ok("问题上报成功");
    }
//
//    @RequestMapping("/sensor/list/auth")
//    @ManagerAuth
//    public R sensorList(@RequestParam(required = false) String condition){
//        Wrapper<Sensor> wrapper = new EntityWrapper<Sensor>()
//                .like("uuid", condition)
//                .orderBy("sensor_type").orderBy("create_time");
//        Long hostId = getHostId();
//        if (hostId != null) {
//            wrapper.eq("host_id", hostId);
//        }
//        List<Sensor> sensors = sensorService.selectList(wrapper);
//        List<AppSensorTypeVo> result = new ArrayList<>();
//        Set<Long> sensorTypeSet = new HashSet<>();
//        for (Sensor sensor : sensors) {
//            AppSensorVo sensorVo = new AppSensorVo();
//            sensorVo.setSensorId(sensor.getId());
//            sensorVo.setUuid(sensor.getUuid());
//            String addr = sensor.getProvince()+sensor.getCity()+sensor.getDistrict();
////            String addr = sensor.getProvince()+","+sensor.getCity()+","+sensor.getDistrict();
//            if (Cools.isEmpty(addr)) {
//                addr = "未知定位";
//            }
//            sensorVo.setAddr(addr);
//
//            if (!sensorTypeSet.contains(sensor.getSensorType())) {
//                sensorTypeSet.add(sensor.getSensorType());
//                SensorType sensorType = sensorTypeService.selectById(sensor.getSensorType());
//                AppSensorTypeVo vo = new AppSensorTypeVo();
//                vo.setSensorTypeFlag(sensorType.getFlag());
//                vo.setSensorTypeId(sensor.getSensorType());
//                vo.setSensorTypeName(sensorType.getName());
//                result.add(vo);
//                vo.getSensors().add(sensorVo);
//            } else {
//                for (AppSensorTypeVo vo : result) {
//                    if (vo.getSensorTypeId().equals(sensor.getSensorType())) {
//                        vo.getSensors().add(sensorVo);
//                    }
//                }
//            }
//        }
//        return R.ok().add(result);
//    }
//
//    @RequestMapping("/sensor/detl/auth")
//    @ManagerAuth
//    public R sensorDetl(@RequestParam Long sensorId){
//        return R.ok().add(sensorService.selectById(sensorId));
//    }

    @RequestMapping("/issue/list/auth")
    @ManagerAuth
    public R sensorList(@RequestParam(required = false) String condition){
        Wrapper<Issue> wrapper = new EntityWrapper<Issue>()
                .like("title", condition)
                .orderBy("settle").orderBy("create_time", false);
        Long hostId = getHostId();
        if (hostId != null) {
            wrapper.eq("host_id", hostId);
        }
        List<Issue> issues = issueService.selectList(wrapper);
        List<AppHostIssueVo> result = new ArrayList<>();
        Set<Long> hostSet = new HashSet<>();
        for (Issue issue : issues) {
            AppIssueVo vo = new AppIssueVo();
            vo.setIssueId(issue.getId());
            vo.setTitle(issue.getTitle());

            if (!hostSet.contains(issue.getHostId())) {
                hostSet.add(issue.getHostId());
                Host host = hostService.selectById(issue.getHostId());
                AppHostIssueVo hostVo = new AppHostIssueVo();
                hostVo.setHostId(host.getId());
                hostVo.setHostName(host.getName());
                result.add(hostVo);
                hostVo.getIssues().add(vo);
            } else {
                for (AppHostIssueVo hostVo : result) {
                    if (hostVo.getHostId().equals(issue.getHostId())) {
                        hostVo.getIssues().add(vo);
                    }
                }
            }
        }
        return R.ok().add(result);
    }

    @RequestMapping("/issue/detl/auth")
    @ManagerAuth
    public R issueDetl(@RequestParam Long issueId){
        return R.ok().add(issueService.selectById(issueId));
    }




 src/main/java/com/zy/sc/manager/controller/result/AppHostIssueVo.java

New file
@@ -0,0 +1,20 @@
package com.zy.sc.manager.controller.result;

import lombok.Data;

import java.util.ArrayList;
import java.util.List;

/**
 * Created by vincent on 2022/2/26
 */
@Data
public class AppHostIssueVo {

    private Long hostId;

    private String hostName;

    private List<AppIssueVo> issues = new ArrayList<>();

}

 src/main/java/com/zy/sc/manager/controller/result/AppIssueVo.java

New file
@@ -0,0 +1,18 @@
package com.zy.sc.manager.controller.result;

import lombok.Data;

/**
 * Created by vincent on 2022/2/26
 */
@Data
public class AppIssueVo {

    private Long issueId;

    private String title;

    private String startTime;


}

 src/main/webapp/static/js/issue/issue.js

@@ -36,7 +36,7 @@
            ,{field: 'discoverer', align: 'center',title: '发现人'}
            ,{field: 'tel', align: 'center',title: '联系方式'}
            ,{field: 'dealer', align: 'center',title: '供应商'}
            ,{field: 'settle', align: 'center',title: ''}
            ,{field: 'settle$', align: 'center',title: '流程'}
            ,{field: 'status$', align: 'center',title: '状态'}
            ,{field: 'createBy$', align: 'center',title: '添加人员'}
            ,{field: 'createTime$', align: 'center',title: '添加时间'}

 src/main/webapp/views/issue/issue.html

@@ -153,9 +153,17 @@
                    </div>
                </div>
                <div class="layui-form-item">
                    <label class="layui-form-label">: </label>
                    <label class="layui-form-label">流程: </label>
                    <div class="layui-input-block">
                        <input class="layui-input" name="settle" placeholder="请输入">
                        <select name="settle">
                            <option value="">请选择流程</option>
                            <option value="1">草稿</option>
                            <option value="2">提交</option>
                            <option value="3">已读</option>
                            <option value="4">处理中</option>
                            <option value="5">完成</option>
                            <option value="0">取消</option>
                        </select>
                    </div>
                </div>
                <div class="layui-form-item">