修改意见问题修改

zengh

2021-07-22 97194e70ad29e4649234912e26ae82b7a8c796a8

修改意见问题修改

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

@@ -522,7 +522,19 @@
        response.setHeader("Access-Control-Allow-Origin", "*");
        response.setHeader("Access-Control-Allow-Methods", "POST, GET, OPTIONS, DELETE");
        response.setHeader("Access-Control-Allow-Credentials","true");
        alarmService.updateJtype(operation.getJid(),operation.getJtype(),operation.getBz(),operation.getSecurityArr());

        String bs = null;
        if (operation.getZc() !=null && operation.getZc() !=""){
            if (operation.getZc().equals("派送保安")){
                bs = "0";
            }else if(operation.getZc().equals("办结")){
                bs = "1";
            }else {
                bs = "2";
            }
        }

        alarmService.updateJtype(operation.getJid(),operation.getJtype(),operation.getBz(),operation.getSecurityArr(),bs);
        alarmService.updatePoliceStatus(operation.getRid(),"0");
        operationService.save(operation);
        //如果警情处理完成，则修改设备状态为正常

 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/entity/Alarm.java

@@ -162,6 +162,8 @@
    private String aaddress;
    private String uids;

    private String alarmbs;

//    @TableLogic
//    private Integer isDeleted;


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

@@ -61,7 +61,7 @@
     */
    List<AlarmVO> selectListSe(String beginTime, String endTime);
    void s(Alarm alarm);
    void updateJtype(String id, String jtype, String bz,String securityArr);
    void updateJtype(String id, String jtype, String bz,String securityArr,String bs);
    void updatePoliceStatus(String id, String status);
    void updateOne(Alarm alarm);
    void updateVaddress(String vaddress,String uids ,String jid);

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

@@ -42,6 +42,7 @@
        <result column="baphone" property="baphone"/>
        <result column="manufacturers" property="manufacturers"/>
        <result column="alarmlb" property="alarmlb"/>
        <result column="alarmbs" property="alarmbs"/>
    </resultMap>

    <!-- 通用查询映射结果 -->
@@ -63,6 +64,9 @@
    <sql id="alarmCondition">
        <if test="alarm.id!=null">
            and a.id = #{alarm.id}
        </if>
        <if test="alarm.alarmbs!=null">
            and a.alarmbs = #{alarm.alarmbs}
        </if>
        <if test="alarm.jtype!=null">
            and a.jtype like concat('%',#{alarm.jtype},'%')
@@ -210,7 +214,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,e.district,a.vaddress,a.aaddress,
        a.alarmId,a.LEVEL,e.jd,e.wd,a.jtype,a.rname,a.jjTime,e.province,e.city,a.cid,
        a.securityArr,a.securityId,a.alarmlb,
        a.securityArr,a.securityId,a.alarmlb,a.alarmbs,
        e.serialNumber,e.oneContacts,e.ThreeContacts,e.twoContacts,e.onePhone,e.twoPhone,e.ThreePhone,
        e.stype,
        e.oneId,
@@ -440,10 +444,14 @@
            ,bz=#{bz}
        </if>

        <if test="securityArr!=null and id!=''">
        <if test="securityArr!=null and securityArr!=''">
            ,securityArr =#{securityArr}
        </if>

        <if test="bs!=null and bs!=''">
            ,alarmbs =#{bs}
        </if>

        where id=#{id}
    </update>


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

@@ -54,7 +54,7 @@
    void updateOne(Alarm alarm);
    List<Map<String, Object>> selectScount(String time);
    List<AlarmVO> selectListSe(String beginTime, String endTime);
    void updateJtype(String id, String jtype, String bz,String securityArr);
    void updateJtype(String id, String jtype, String bz,String securityArr,String bs);
    void updateVaddress(String vaddress,String uids,String jid);
    void updatePoliceStatus(String id, String status);
    void updateAaddress(String aaddress,String jid);

 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/service/impl/AlarmServiceImpl.java

@@ -98,8 +98,8 @@
    }

    @Override
    public void updateJtype(String id,String jtype,String bz,String securityArr) {
        baseMapper.updateJtype(id,jtype,bz,securityArr);
    public void updateJtype(String id,String jtype,String bz,String securityArr,String bs) {
        baseMapper.updateJtype(id,jtype,bz,securityArr,bs);
    }

    @Override

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

@@ -310,7 +310,7 @@
                iWjService.insertfeed(wj);
            }
        }
        alarmService.updateJtype(operation.getJid(), "2", null, null);
        alarmService.updateJtype(operation.getJid(), "2", null, null,null);

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

 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/security/entity/Security.java

@@ -20,6 +20,8 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -39,8 +41,9 @@

    private static final long serialVersionUID = 1L;

    @JsonSerialize(using = ToStringSerializer.class)
    @TableId(value = "id", type = IdType.AUTO)
    private Integer id;
    private long id;
    /**
    * 人员编号
    */

 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/security/mapper/SecurityMapper.xml

@@ -47,8 +47,34 @@
        order by s.snumber asc
    </select>

<!--    <select id="selectList" resultMap="securityResultMaps">-->
<!--        SELECT s.*,p.jd,p.wd,ST_ASTEXT(e.coordinate) as coordinate FROM sys_security s LEFT JOIN sys_position p on p.snumber=s.snumber LEFT JOIN sys_enclosure e on e.anumber=s.snumber-->
<!--    </select>-->
    <select id="selectList" resultMap="securityResultMaps">
        SELECT s.*,p.jd,p.wd,ST_ASTEXT(e.coordinate) as coordinate FROM sys_security s LEFT JOIN sys_position p on p.snumber=s.snumber LEFT JOIN sys_enclosure e on e.anumber=s.snumber
        SELECT
        bu.id,
        bu.id  AS snumber,
        bu.NAME AS sname,
        bu.CODE,
        bu.real_name,
        bu.account,
        bu.email,
        bu.phone,
        bu.birthday,
        bu.create_time,
        bu.sex,
        ifnull( bu.online_status, 0 ) online_status,
        bd.dept_name,
        ST_ASTEXT ( e.coordinate ) AS coordinate
    FROM
        jfpth.blade_user bu
        LEFT JOIN jfpth.blade_dept bd ON bd.id = bu.dept_id
        LEFT JOIN jfpth.blade_role br ON bu.role_id = br.id
        LEFT JOIN sys_enclosure e ON e.anumber = bu.id
    WHERE
        br.role_alias = '处警员'
        AND bu.is_deleted =0

    </select>
<!--人员详情-->
    <select id="selectInfo" resultMap="securityResultMaps">