app接口

zengh

2021-04-25 6d0e9eee0895aae948852421002b27af3519ad6f

app接口

 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/controller/AlarmController.java

@@ -36,6 +36,7 @@
import org.springblade.jfpt.animalheat.service.AnimalHeatService;
import org.springblade.common.entity.AlarmExcel;
import org.springblade.jfpt.healthcode.service.IhealthcodeService;
import org.springblade.jfpt.operation.entity.Operation;
import org.springblade.jfpt.operation.service.IOperationService;
import org.springblade.jfpt.operation.vo.OperationVO;
import org.springblade.jfpt.parcel.service.ParcelService;
@@ -671,6 +672,22 @@
        response.setHeader("Access-Control-Allow-Origin", "*");
        response.setHeader("Access-Control-Allow-Methods", "POST, GET, OPTIONS, DELETE");
        response.setHeader("Access-Control-Allow-Credentials","true");

        SimpleDateFormat sdf = new SimpleDateFormat();// 格式化时间
        sdf.applyPattern("yyyy-MM-dd HH:mm:ss");// a为am/pm的标记
        Date date = new Date();// 获取当前时间
        //System.out.println("现在时间：" + sdf.format(date)); // 输出已经格式化的现在时间（24小时制）

        Operation operation = null;
        operation.setJid(alarmVO.getId().toString());
        operation.setSnumber(alarmVO.getSecurityId());
        operation.setZc("接受任务");
        operation.setSname(alarmVO.getAlarmPeople());

        operation.setZctime(sdf.format(date));
        operationService.save(operation);


        return R.status(alarmService.setAlarm(alarmVO));
    }


 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/mapper/AlarmMapper.xml

@@ -34,6 +34,8 @@
        <result column="vaddress" property="vaddress"/>
        <result column="aaddress" property="aaddress"/>
        <result column="uids" property="uids"/>
        <result column="securityArr" property="securityArr"/>
        <result column="securityId" property="securityId"/>
    </resultMap>

    <sql id="alarmCondition">
@@ -186,6 +188,7 @@
        a.id,a.alarmType,a.alarmPeople,a.alarmTime,a.galarmPeople,a.sex,a.phoneNumber,a.content,a.waringType,a.bz,
        a.deviceNumber,a.region,a.district,a.vaddress,a.aaddress,
        a.alarmId,a.LEVEL,e.jd,e.wd,a.jtype,a.rname,a.jjTime,a.province,a.city,a.cid,
        a.securityArr,a.securityId,
        e.serialNumber,e.oneContacts,e.ThreeContacts,e.twoContacts,e.onePhone,e.twoPhone,e.ThreePhone,
        e.stype,
        e.oneId,

 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/feedback/controller/FeedbackController.java

@@ -27,10 +27,13 @@
import org.springblade.core.mp.support.Query;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.Func;
import org.springblade.jfpt.alarm.service.IAlarmService;
import org.springblade.jfpt.feedback.entity.Feedback;
import org.springblade.jfpt.feedback.service.IFeedbackService;
import org.springblade.jfpt.feedback.vo.FeedbackVO;
import org.springblade.jfpt.feedback.wrapper.FeedbackWrapper;
import org.springblade.jfpt.operation.entity.Operation;
import org.springblade.jfpt.operation.service.IOperationService;
import org.springblade.jfpt.wj.entity.Wj;
import org.springblade.jfpt.wj.service.IWjService;
import org.springframework.web.bind.annotation.*;
@@ -40,6 +43,7 @@
import javax.validation.Valid;
import java.io.File;
import java.io.IOException;
import java.text.SimpleDateFormat;
import java.util.*;

/**
@@ -55,7 +59,9 @@
public class FeedbackController extends BladeController {

    private final IFeedbackService feedbackService;
    private final IAlarmService alarmService;
    private IWjService iWjService;
    private final IOperationService operationService;

    /**
     * 详情
@@ -262,6 +268,21 @@
     */
    @PostMapping("/saves")
    public R saves(FeedbackVO feedback) {

        SimpleDateFormat sdf = new SimpleDateFormat();// 格式化时间
        sdf.applyPattern("yyyy-MM-dd HH:mm:ss");// a为am/pm的标记
        Date date = new Date();// 获取当前时间
        //System.out.println("现在时间：" + sdf.format(date)); // 输出已经格式化的现在时间（24小时制）

        Operation operation = null;
        operation.setJid(feedback.getJid());
        operation.setSnumber(feedback.getSnumber());
        operation.setZc("任务反馈提交,警情结束");
        operation.setSname(feedback.getSname());

        operation.setZctime(sdf.format(date));
        operationService.save(operation);

        feedbackService.save(feedback);
        Wj wj = new Wj();
        //获取视频地址
@@ -277,6 +298,9 @@
            wj.setAddress(string3);
            iWjService.insertfeed(wj);
        }

        alarmService.updatePoliceStatus(feedback.getJid(),"2");

        return R.success("新增成功");
    }
}