警情修改记录接口

amos-boot-system-tzs/amos-boot-module-96333/amos-boot-module-96333-api/src/main/java/com/yeejoin/amos/boot/module/elevator/api/dto/AlertFormRecordDto.java

+package com.yeejoin.amos.boot.module.elevator.api.dto;
+
+import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+
+/**
+ * 
+ *
+ * @author system_generator
+ * @date 2023-11-02
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value="AlertFormRecordDto", description="")
+public class AlertFormRecordDto extends BaseDto {
+
+   private static final long serialVersionUID = 1L;
+
+
+    @ApiModelProperty(value = "警情id")
+    private Long alertCalledId;
+
+    @ApiModelProperty(value = "警情类型")
+    private String alertTypeCode;
+
+    @ApiModelProperty(value = "救援人姓名")
+    private String name;
+
+    @ApiModelProperty(value = "救援人电话")
+    private String phone;
+
+    @ApiModelProperty(value = "被困人数")
+    private Integer trappedNum;
+
+    @ApiModelProperty(value = "受伤人数")
+    private Integer injuredNum;
+
+    @ApiModelProperty(value = "死亡人数")
+    private Integer dieNum;
+
+    @ApiModelProperty(value = "被困楼层")
+    private Integer trappedFloorNum;
+
+    @ApiModelProperty(value = "是否有光照")
+    private Integer isLight;
+
+    @ApiModelProperty(value = "被困时间")
+    private Date trappedTime;
+
+    @ApiModelProperty(value = "事件描述")
+    private String description;
+
+    @ApiModelProperty(value = "故障报修描述")
+    private String faultReport;
+
+    @ApiModelProperty(value = "投诉咨询描述")
+    private String complaintConsulttation;
+
+    @ApiModelProperty(value = "备注")
+    private String remarks;
+
+}

amos-boot-system-tzs/amos-boot-module-96333/amos-boot-module-96333-api/src/main/java/com/yeejoin/amos/boot/module/elevator/api/entity/AlertFormRecord.java

+package com.yeejoin.amos.boot.module.elevator.api.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.util.Date;
+
+/**
+ * @author system_generator
+ * @date 2023-11-02
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@TableName("tz_alert_form_record")
+public class AlertFormRecord extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 警情id
+     */
+    @TableField("alert_called_id")
+    private Long alertCalledId;
+
+    /**
+     * 警情类型
+     */
+    @TableField("alert_type_code")
+    private String alertTypeCode;
+
+    /**
+     * 救援人姓名
+     */
+    @TableField("name")
+    private String name;
+
+    /**
+     * 救援人电话
+     */
+    @TableField("phone")
+    private String phone;
+
+    /**
+     * 被困人数
+     */
+    @TableField("trapped_num")
+    private Integer trappedNum;
+
+    /**
+     * 受伤人数
+     */
+    @TableField("injured_num")
+    private Integer injuredNum;
+
+    /**
+     * 死亡人数
+     */
+    @TableField("die_num")
+    private Integer dieNum;
+
+    /**
+     * 被困楼层
+     */
+    @TableField("trapped_floor_num")
+    private Integer trappedFloorNum;
+
+    /**
+     * 是否有光照
+     */
+    @TableField("is_light")
+    private Integer isLight;
+
+    /**
+     * 被困时间
+     */
+    @TableField("trapped_time")
+    private Date trappedTime;
+
+    /**
+     * 事件描述
+     */
+    @TableField("description")
+    private String description;
+
+    /**
+     * 故障报修描述
+     */
+    @TableField("fault_report")
+    private String faultReport;
+
+    /**
+     * 投诉咨询描述
+     */
+    @TableField("complaint_consulttation")
+    private String complaintConsulttation;
+
+    /**
+     * 备注
+     */
+    @TableField("remarks")
+    private String remarks;
+
+}

amos-boot-system-tzs/amos-boot-module-96333/amos-boot-module-96333-api/src/main/java/com/yeejoin/amos/boot/module/elevator/api/mapper/AlertFormRecordMapper.java

+package com.yeejoin.amos.boot.module.elevator.api.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yeejoin.amos.boot.module.elevator.api.entity.AlertFormRecord;
+
+import java.util.List;
+
+/**
+ *  Mapper 接口
+ *
+ * @author system_generator
+ * @date 2023-11-02
+ */
+public interface AlertFormRecordMapper extends BaseMapper<AlertFormRecord> {
+
+    List<AlertFormRecord> getRecordByCalledId(Long alertCalledId);
+
+}

amos-boot-system-tzs/amos-boot-module-96333/amos-boot-module-96333-api/src/main/java/com/yeejoin/amos/boot/module/elevator/api/service/IAlertFormRecordService.java

+package com.yeejoin.amos.boot.module.elevator.api.service;
+
+
+import com.yeejoin.amos.boot.module.elevator.api.dto.AlertFormRecordDto;
+import com.yeejoin.amos.boot.module.elevator.api.entity.AlertFormRecord;
+import org.typroject.tyboot.core.restful.utils.ResponseModel;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 接口类
+ *
+ * @author system_generator
+ * @date 2023-11-02
+ */
+public interface IAlertFormRecordService {
+
+    /**
+     * 保存警情修改记录
+     *
+     * @param map 包含新旧数据的map
+     * @return
+     */
+    ResponseModel<Object> saveAlertFormRecord(Map<String, AlertFormRecordDto> map);
+
+    /**
+     * 根据警情id查询所有修改记录
+     * @param alertCalledId 警情id
+     * @return 记录
+     */
+    List<AlertFormRecord> allAlertFormRecordByCalledId(Long alertCalledId);
+
+}

amos-boot-system-tzs/amos-boot-module-96333/amos-boot-module-96333-api/src/main/resources/mapper/AlertFormRecordMapper.xml

+<?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.yeejoin.amos.boot.module.elevator.api.mapper.AlertFormRecordMapper">
+
+    <select id="getRecordByCalledId"
+            resultType="com.yeejoin.amos.boot.module.elevator.api.entity.AlertFormRecord">
+        SELECT *
+        FROM tz_alert_form_record afr
+        WHERE afr.is_delete = 0
+        <if test="TzCarcylRegDto!=null and TzCarcylRegDto!='' ">
+            AND afr.alert_called_id = #{alertCalledId}
+        </if>
+        ORDER BY afr.rec_date
+    </select>
+</mapper>

amos-boot-system-tzs/amos-boot-module-96333/amos-boot-module-96333-biz/src/main/java/com/yeejoin/amos/boot/module/elevator/biz/controller/AlertFormRecordController.java

+package com.yeejoin.amos.boot.module.elevator.biz.controller;
+
+
+import cn.hutool.core.util.ObjectUtil;
+import com.yeejoin.amos.boot.module.elevator.api.dto.AlertFormRecordDto;
+import com.yeejoin.amos.boot.module.elevator.api.service.IAlertFormRecordService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.typroject.tyboot.core.foundation.enumeration.UserType;
+import org.typroject.tyboot.core.restful.doc.TycloudOperation;
+import org.typroject.tyboot.core.restful.utils.ResponseHelper;
+import org.typroject.tyboot.core.restful.utils.ResponseModel;
+
+import java.util.Map;
+
+/**
+ * 警情接警修改记录Api
+ */
+@RestController
+@Api(tags = "警情接警修改记录Api")
+@RequestMapping(value = "/alert-update")
+public class AlertFormRecordController {
+
+    @Autowired
+    private IAlertFormRecordService iAlertFormRecordService;
+
+
+    @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
+    @PostMapping(value = "/saveRecord")
+    @ApiOperation(httpMethod = "POST", value = "新增警情接警填报记录", notes = "新增警情接警填报记录")
+    public ResponseModel<Object> saveMobile(@RequestBody Map<String, AlertFormRecordDto> map) {
+
+        if (ObjectUtil.isNotEmpty(map.get("oldData")) && ObjectUtil.isNotEmpty(map.get("newData"))) {
+            return ResponseHelper.buildResponse(iAlertFormRecordService.saveAlertFormRecord(map));
+        } else {
+            return ResponseHelper.buildResponse("缺少数据");
+        }
+    }
+
+
+    @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
+    @PostMapping(value = "/recordByCalledId")
+    @ApiOperation(httpMethod = "POST", value = "根据警情id查询修改记录", notes = "根据警情id查询修改记录")
+    public ResponseModel<Object> saveMobile(@RequestParam("alertCalledId") String alertCalledId) {
+        return ResponseHelper.buildResponse(iAlertFormRecordService.allAlertFormRecordByCalledId(Long.valueOf(alertCalledId)));
+    }
+
+}

amos-boot-system-tzs/amos-boot-module-96333/amos-boot-module-96333-biz/src/main/java/com/yeejoin/amos/boot/module/elevator/flc/biz/service/impl/AlertFormRecordServiceImpl.java

+package com.yeejoin.amos.boot.module.elevator.flc.biz.service.impl;
+
+import com.yeejoin.amos.boot.module.common.biz.utils.CommonResponseUtil;
+import com.yeejoin.amos.boot.module.elevator.api.dto.AlertFormRecordDto;
+import com.yeejoin.amos.boot.module.elevator.api.entity.AlertFormRecord;
+import com.yeejoin.amos.boot.module.elevator.api.mapper.AlertFormRecordMapper;
+import com.yeejoin.amos.boot.module.elevator.api.service.IAlertFormRecordService;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.typroject.tyboot.core.rdbms.service.BaseService;
+import org.typroject.tyboot.core.restful.utils.ResponseHelper;
+import org.typroject.tyboot.core.restful.utils.ResponseModel;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 服务实现类
+ *
+ * @author system_generator
+ * @date 2023-11-02
+ */
+@Service
+public class AlertFormRecordServiceImpl extends BaseService<AlertFormRecordDto, AlertFormRecord, AlertFormRecordMapper> implements IAlertFormRecordService {
+
+    @Autowired
+    private AlertFormRecordMapper alertFormRecordMapper;
+
+    /**
+     * 保存警情修改记录
+     *
+     * @param map 包含新旧数据的map
+     * @return
+     */
+    @Override
+    @Transactional
+    public ResponseModel saveAlertFormRecord(Map<String, AlertFormRecordDto> map) {
+        try {
+            AlertFormRecordDto oldData = map.get("oldData");
+            AlertFormRecordDto newData = map.get("newData");
+            List<AlertFormRecord> recordByCalledId = alertFormRecordMapper.getRecordByCalledId(newData.getAlertCalledId());
+            AlertFormRecord record = new AlertFormRecord();
+            //第一次修改，保存旧记录
+            if (recordByCalledId.isEmpty()) {
+                BeanUtils.copyProperties(oldData, record);
+                record.setRecDate(oldData.getTrappedTime());
+                alertFormRecordMapper.insert(record);
+            }
+            BeanUtils.copyProperties(newData, record);
+            alertFormRecordMapper.insert(record);
+            return ResponseHelper.buildResponse("保存警情记录成功");
+        } catch (Exception e) {
+            log.error(e.getMessage(), e);
+            return CommonResponseUtil.failure("保存警情记录失败");
+        }
+    }
+
+    /**
+     * 根据警情id查询所有修改记录
+     *
+     * @param alertCalledId 警情id
+     * @return 记录
+     */
+    @Override
+    public List<AlertFormRecord> allAlertFormRecordByCalledId(Long alertCalledId) {
+
+
+        return alertFormRecordMapper.getRecordByCalledId(alertCalledId);
+    }
+}
\ No newline at end of file

amos-boot-system-tzs/amos-boot-module-tzspatrol/amos-boot-module-tzspatrol-biz/src/main/java/com/yeejoin/amos/patrol/business/service/impl/RouteServiceImpl.java

@@ -549,7 +549,7 @@ public class RouteServiceImpl  extends ServiceImpl<RouteMapper, Route> implement
         if (oldRoutePointList != null && oldRoutePointList.size() > 0) {
 
             RoutePoint RoutePoint = oldRoutePointList.get(0);
-            if (!"".equals(RoutePoint.getExcludeItems()) && !RoutePoint.getExcludeItems().isEmpty()){
+            if (!"".equals(RoutePoint.getExcludeItems()) && RoutePoint.getExcludeItems() != null){
                 List<Long> split = Arrays.asList(RoutePoint.getExcludeItems().split(",")).stream().map(Long::parseLong).collect(Collectors.toList());
 
                 Set<Long> allPointInputItemIdSet = iPointInputItemDao.getPointInputItemByPointIdAndClassifyId(pointId, classifyId)