南昌市物联网技防平台-后台
tangzy
2021-03-14 15c3373a01a1ba7c4afadb45d4b861bdb9145562
1.缴费
6 files modified
24 ■■■■■ changed files
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/controller/EquipmentController.java 11 ●●●●● patch | view | raw | blame | history
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/mapper/EquipmentMapper.java 1 ●●●● patch | view | raw | blame | history
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/mapper/EquipmentMapper.xml 4 ●●●● patch | view | raw | blame | history
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/service/IEquipmentService.java 1 ●●●● patch | view | raw | blame | history
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/service/impl/EquipmentServiceImpl.java 5 ●●●●● patch | view | raw | blame | history
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/position/mapper/PositionMapper.xml 2 ●●● patch | view | raw | blame | history
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/controller/EquipmentController.java
@@ -340,4 +340,15 @@
        return R.data(list);
    }
    /**
     * 修改
     */
    @PostMapping("/updateexpireTime")
    @ApiOperationSupport(order = 5)
    @ApiOperation(value = "修改", notes = "传入equipment")
    public R updateexpireTime(String expireTime,String deviceNumber) {
        equipmentService.updateexpireTime(expireTime,deviceNumber);
        return R.success("修改成功");
    }
}
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/mapper/EquipmentMapper.java
@@ -66,4 +66,5 @@
    EquipmentVOS selectInfo(Equipment equipment);
    List<Map<String, Object>> selectInfos(String deviceNumber);
    void updateChannel(String heartbeat, String deviceNumber);
    void updateexpireTime(String expireTime, String deviceNumber);
}
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/mapper/EquipmentMapper.xml
@@ -254,4 +254,8 @@
    update sys_equipment SET heartbeat=#{heartbeat} where deviceNumber=#{deviceNumber}
</update>
    <update id="updateexpireTime">
        update sys_equipment SET expireTime=#{expireTime} where deviceNumber=#{deviceNumber}
    </update>
</mapper>
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/service/IEquipmentService.java
@@ -80,4 +80,5 @@
     * @return
     */
    Integer selectEquipmentCount(Integer status);
    void updateexpireTime(String expireTime, String deviceNumber);
}
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/service/impl/EquipmentServiceImpl.java
@@ -152,4 +152,9 @@
        //返回数据
        return equipmentCount;
    }
    @Override
    public void updateexpireTime(String expireTime, String deviceNumber) {
        baseMapper.updateexpireTime(expireTime,deviceNumber);
    }
}
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/position/mapper/PositionMapper.xml
@@ -64,7 +64,7 @@
    <select id="selectfj" resultType="java.util.HashMap">
        SELECT
        snumber, `sname`,jd,wd(
        snumber, `sname`,jd,wd,(
        6371 * acos (
        cos ( radians(wd) )
        * cos( radians(#{wd}) )