aix
2024-08-27 52c3c643424ff89af98060ba1b8e18bf730cd07c
白蚁监测数据状态修改
6 files modified
25 ■■■■■ changed files
skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/sjztods/entity/WaterDataTermites.java 7 ●●●●● patch | view | raw | blame | history
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztods/controller/WaterDataTermitesController.java 8 ●●●● patch | view | raw | blame | history
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztods/mapper/WaterDataTermitesMapper.java 2 ●●● patch | view | raw | blame | history
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztods/mapper/WaterDataTermitesMapper.xml 2 ●●● patch | view | raw | blame | history
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztods/service/IWaterDataTermitesService.java 2 ●●● patch | view | raw | blame | history
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztods/service/impl/WaterDataTermitesServiceImpl.java 4 ●●●● patch | view | raw | blame | history
skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/sjztods/entity/WaterDataTermites.java
@@ -25,4 +25,11 @@
    @TableField("\"device_id\"")
    private Integer deviceId;
    /**
     * 设备id
     */
    @ApiModelProperty(value = "设备id")
    @TableField("\"order\"")
    private String order;
}
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztods/controller/WaterDataTermitesController.java
@@ -33,16 +33,16 @@
    @PostMapping(value = "/updateStatus")
    public R updateStatus(@RequestBody WaterDataTermitesVO waterDataTermites) {
        if (StringUtil.isAllBlank(waterDataTermites.getStartTime(),
            waterDataTermites.getEndTime()) ||
            null == waterDataTermites.getStatus() ||
        null == waterDataTermites.getDeviceId()) {
            waterDataTermites.getEndTime(),
        waterDataTermites.getOrder()) ||
            null == waterDataTermites.getStatus()) {
            return R.fail("非法参数");
        }
        boolean ret = waterDataTermitesService.updateWaterDataTermites(waterDataTermites.getStartTime(),
            waterDataTermites.getEndTime(),
            waterDataTermites.getStatus(),
            waterDataTermites.getDeviceId());
            waterDataTermites.getOrder());
        return R.status(ret);
    }
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztods/mapper/WaterDataTermitesMapper.java
@@ -9,6 +9,6 @@
    int updateWaterDataTermites(@Param("startTime") String startTime,
                                 @Param("endTime") String endTime,
                                 @Param("status") Integer status,
                                 @Param("deviceId") Integer deviceId);
                                 @Param("order") String order);
}
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztods/mapper/WaterDataTermitesMapper.xml
@@ -4,7 +4,7 @@
    <update id="updateWaterDataTermites">
        update SJZT_ODS."water_data_termites" set "status" = #{status}
        WHERE "device_id" = #{deviceId} and "ob_date" &gt;= #{startTime} and "ob_date" &lt;= #{endTime}
        WHERE "order" = #{order} and "ob_date" &gt;= #{startTime} and "ob_date" &lt;= #{endTime}
    </update>
</mapper>
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztods/service/IWaterDataTermitesService.java
@@ -11,6 +11,6 @@
    boolean updateWaterDataTermites(String startTime,
                                 String endTime,
                                 Integer status,
                                    Integer deviceId);
                                    String order);
}
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztods/service/impl/WaterDataTermitesServiceImpl.java
@@ -13,7 +13,7 @@
    @Override
    public boolean updateWaterDataTermites(String startTime, String endTime, Integer status, Integer deviceId) {
        return baseMapper.updateWaterDataTermites(startTime, endTime, status, deviceId) > 0;
    public boolean updateWaterDataTermites(String startTime, String endTime, Integer status, String order) {
        return baseMapper.updateWaterDataTermites(startTime, endTime, status, order) > 0;
    }
}