解决警情分发的接口报错问题

zengh

2021-03-11 bc251e599ba9c3babd5b10b924107c1db427eca1

解决警情分发的接口报错问题

 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/jingdan/controller/JingdanController.java

@@ -121,7 +121,17 @@
    @ApiOperation(value = "新增或修改", notes = "传入jingdan")
    public R submit(@Valid @RequestBody Jingdan jingdan) {
        //return R.status(jingdanService.saveOrUpdate(jingdan));
        return R.status(jingdanService.save(jingdan));

        if (jingdan.getCzTime() != null && jingdan.getCzTime().equals("")){
            jingdan.setCzTime(null);
        }
        if (jingdan.getGalarmTime() != null && jingdan.getGalarmTime().equals("")){
            jingdan.setGalarmTime(null);
        }
        if (jingdan.getHandleTime() != null && jingdan.getHandleTime().equals("")){
            jingdan.setHandleTime(null);
        }
        return R.status(jingdanService.saveOrUpdate(jingdan));
    }


@@ -214,7 +224,7 @@
        response.setHeader("Access-Control-Allow-Origin", "*");
        response.setHeader("Access-Control-Allow-Methods", "POST, GET, OPTIONS, DELETE");
        response.setHeader("Access-Control-Allow-Credentials","true");
        jingdanService.insert(galarmPeople,phoneNumber,place,content,galarmTime,waringType,deviceNumber,type,handleP,handleTime,handName,level,coordinate,jd,wd,addvcd,rName,czTime,bz);
        jingdanService.inserts(galarmPeople,phoneNumber,place,content,galarmTime,waringType,deviceNumber,type,handleP,handleTime,handName,level,coordinate,jd,wd,addvcd,rName,czTime,bz);
        return R.success("成功");
    }


 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/jingdan/entity/Jingdan.java

@@ -112,8 +112,8 @@
    /**
    * 空间坐标
    */
        @ApiModelProperty(value = "空间坐标")
        private String coordinate;
//        @ApiModelProperty(value = "空间坐标")
//        private String coordinate;
    /**
    * 经度
    */
@@ -125,7 +125,9 @@
        @ApiModelProperty(value = "纬度")
        private String wd;

        private String addvcd;
        private String province;
        private String city;
        private String district;
        @TableField("rName")
        private String rName;
        private String handletype;

 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/jingdan/mapper/JingdanMapper.java

@@ -57,7 +57,7 @@
     */
    List<JingdanVO> selectdInfo(String deviceNumber, String id);

    int insert(String galarmPeople, String phoneNumber, String place, String content,
    int inserts(String galarmPeople, String phoneNumber, String place, String content,
               String galarmTime, String waringType, String deviceNumber, String type, String handleP,
               String handleTime, String handName, String level, String coordinate, String jd, String wd,
               String addvcd, String rName, String czTime, String bz);

 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/jingdan/mapper/JingdanMapper.xml

@@ -20,15 +20,17 @@
        <result column="coordinate" property="coordinate"/>
        <result column="jd" property="jd"/>
        <result column="wd" property="wd"/>
        <result column="addvcd" property="addvcd"/>
        <result column="district" property="district"/>
        <result column="province" property="province"/>
        <result column="city" property="city"/>
        <result column="rName" property="rName"/>
        <result column="handletype" property="handletype"/>
    </resultMap>

    <select id="selectJingdanPage" resultMap="jingdanResultMap">
        SELECT j.id,j.galarmPeople,j.phoneNumber,j.place,j.content,j.galarmTime,j.waringType,j.deviceNumber,j.type,
        j.handleP,j.handleTime,j.handName,j.level,ST_ASTEXT(j.coordinate) as coordinate,j.jd,j.wd,j.addvcd,j.rName,
        d.addvnm FROM sys_jingdan j LEFT JOIN sys_district d on d.addvcds=j.addvcd where 1=1
        j.handleP,j.handleTime,j.handName,j.level,j.jd,j.wd,j.district,j.rName,
        j.province,j.city FROM sys_jingdan j  where 1=1
        <if test="jingdan.waringType!=null and jingdan.waringType!=''">
            and j.waringType=#{jingdan.waringType}
        </if>
@@ -38,8 +40,14 @@
        <if test="jingdan.endTime!=null and jingdan.endTime!=''">
            and j.galarmTime &lt;=#{jingdan.endTime}
        </if>
        <if test="jingdan.addvcd!=null and jingdan.addvcd!=''">
            and j.addvcd=#{jingdan.addvcd}
        <if test="jingdan.district!=null">
            and j.district like concat('%',#{jingdan.district},'%')
        </if>
        <if test="jingdan.province!=null">
            and j.province like concat('%',#{jingdan.province},'%')
        </if>
        <if test="jingdan.city!=null">
            and j.city like concat('%',#{jingdan.city},'%')
        </if>
        <if test="jingdan.type!=null and jingdan.type!=''">
            and j.type=#{jingdan.type}
@@ -49,8 +57,8 @@

    <select id="selectList" resultMap="jingdanResultMap">
        SELECT j.id,j.galarmPeople,j.phoneNumber,j.place,j.content,j.galarmTime,j.waringType,j.deviceNumber,j.type,
        j.handleP,j.handleTime,j.handName,j.level,ST_ASTEXT(j.coordinate) as coordinate,j.jd,j.wd,j.addvcd,j.rName,
        d.addvnm FROM sys_jingdan j LEFT JOIN sys_district d on d.addvcds=j.addvcd where 1=1
        j.handleP,j.handleTime,j.handName,j.level,ST_ASTEXT(j.coordinate) as coordinate,j.jd,j.wd,j.district,j.rName,
        d.addvnm FROM sys_jingdan j LEFT JOIN sys_district d on d.addvcds=j.district where 1=1
        <if test="waringType!=null and waringType!=''">
            and j.waringType=#{waringType}
        </if>
@@ -60,8 +68,8 @@
        <if test="endTime!=null and endTime!=''">
            and j.galarmTime &lt;=#{endTime}
        </if>
        <if test="addvcd!=null and addvcd!=''">
            and j.addvcd=#{addvcd}
        <if test="district!=null and district!=''">
            and j.district=#{district}
        </if>
        <if test="type!=null and type!=''">
            and j.type=#{type}
@@ -70,8 +78,8 @@

    <select id="selectdInfo" resultMap="jingdanResultMap">
        SELECT j.id,j.galarmPeople,j.phoneNumber,j.place,j.content,j.galarmTime,j.waringType,j.deviceNumber,j.type,
        j.handleP,j.handleTime,j.handName,j.level,ST_ASTEXT(j.coordinate) as coordinate,j.jd,j.wd,j.addvcd,j.rName,j.handletype,
        d.addvnm FROM sys_jingdan j LEFT JOIN sys_district d on d.addvcds=j.addvcd where 1=1
        j.handleP,j.handleTime,j.handName,j.level,ST_ASTEXT(j.coordinate) as coordinate,j.jd,j.wd,j.district,j.rName,j.handletype,
        d.addvnm FROM sys_jingdan j LEFT JOIN sys_district d on d.addvcds=j.district where 1=1
        <if test="deviceNumber!=null and deviceNumber!=''">
            and j.deviceNumber=#{deviceNumber}
        </if>
@@ -83,8 +91,8 @@
    <!--APP警单列表-->
    <select id="selectLists" resultMap="jingdanResultMap">
        SELECT j.id,j.galarmPeople,j.phoneNumber,j.place,j.content,j.galarmTime,j.waringType,j.deviceNumber,j.type,
        j.handleP,j.handleTime,j.handName,j.level,ST_ASTEXT(j.coordinate) as coordinate,j.jd,j.wd,j.addvcd,j.rName,j.handletype,
        d.addvnm FROM sys_jingdan j LEFT JOIN sys_district d on d.addvcds=j.addvcd where 1=1
        j.handleP,j.handleTime,j.handName,j.level,ST_ASTEXT(j.coordinate) as coordinate,j.jd,j.wd,j.district,j.rName,j.handletype,
        d.addvnm FROM sys_jingdan j LEFT JOIN sys_district d on d.addvcds=j.district where 1=1
        <if test="handleP!=null and handleP!=''">
            and j.handleP=#{handleP}
        </if>
@@ -95,10 +103,10 @@

<!--    <insert id="insert">-->
<!--        insert into sys_jingdan(galarmPeople,phoneNumber,place,content,galarmTime,waringType,deviceNumber,type,-->
<!--        handleP,handleTime,handName,level,coordinate,jd,wd,addvcd)-->
<!--        handleP,handleTime,handName,level,coordinate,jd,wd,district)-->
<!--        values (#{galarmPeople},#{phoneNumber},#{place},#{content},#{galarmTime}-->
<!--        ,#{waringType},#{deviceNumber},#{type},#{handleP},#{handleTime},-->
<!--        #{handName},#{level},POINT(#{jd},#{wd}),#{jd},#{wd},#{addvcd})-->
<!--        #{handName},#{level},POINT(#{jd},#{wd}),#{jd},#{wd},#{district})-->
<!--    </insert>-->


@@ -140,17 +148,20 @@
            <if test="level!=null and level!=''">
                level,
            </if>
            <if test="coordinate=null and coordinate=''">
                coordinate,
            </if>
            <if test="jd!=null and jd!=''">
                jd,
            </if>
            <if test="wd!=null and wd!=''">
                wd,
            </if>
            <if test="addvcd!=null and addvcd!=''">
                addvcd,
            <if test="district!=null and district!=''">
                district,
            </if>
            <if test="city!=null and city!=''">
                city,
            </if>
            <if test="province!=null and province!=''">
                province,
            </if>
            <if test="rName!=null and rName!=''">
                rName,
@@ -201,9 +212,6 @@
            <if test="level!=null and level!=''">
                #{level},
            </if>
            <if test="coordinate=null and coordinate=''">
                coordinate,
            </if>
            <if test="jd!=null and wd!=null">
                POINT(#{jd},#{wd}),
            </if>
@@ -213,8 +221,14 @@
            <if test="wd!=null and wd!=''">
                #{wd},
            </if>
            <if test="addvcd!=null and addvcd!=''">
                #{addvcd},
            <if test="district!=null and district!=''">
                #{district},
            </if>
            <if test="province!=null and province!=''">
                #{province},
            </if>
            <if test="city!=null and city!=''">
                #{city},
            </if>
            <if test="rName!=null and rName!=''">
                #{rName},
@@ -227,7 +241,7 @@
            </if>
        </trim>
    </sql>
    <insert id="insert">
    <insert id="inserts">
        insert into sys_jingdan(<include refid="key"/>) values(<include refid="value"/>)
    </insert>


 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/jingdan/service/IJingdanService.java

@@ -42,7 +42,7 @@
    List<JingdanVO> selectList(String waringType, String beginTime, String endTime, String addvcd, String type);
    List<JingdanVO> selectLists(String handleP, String type);
    List<JingdanVO> selectdInfo(String deviceNumber, String id);
    void insert(String galarmPeople, String phoneNumber, String place, String content,
    void inserts(String galarmPeople, String phoneNumber, String place, String content,
                String galarmTime, String waringType, String deviceNumber, String type, String handleP,
                String handleTime, String handName, String level, String coordinate, String jd, String wd,
                String addvcd, String rName, String czTime, String bz);

 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/jingdan/service/impl/JingdanServiceImpl.java

@@ -57,11 +57,11 @@
    }

    @Override
    public void insert(String galarmPeople,String phoneNumber,String place,String content,
    public void inserts(String galarmPeople,String phoneNumber,String place,String content,
                       String galarmTime,String waringType,String deviceNumber,String type,String handleP,
                       String handleTime,String handName,String level,String coordinate,String jd,String wd,
                       String addvcd,String rName,String czTime,String bz) {
        baseMapper.insert(galarmPeople,phoneNumber,place,content,galarmTime,waringType,deviceNumber,type,handleP,handleTime,handName,level,coordinate,jd,wd,addvcd,rName,czTime,bz);
        baseMapper.inserts(galarmPeople,phoneNumber,place,content,galarmTime,waringType,deviceNumber,type,handleP,handleTime,handName,level,coordinate,jd,wd,addvcd,rName,czTime,bz);
    }

    @Override