Browse Source

1、修改预警确认代码;2、修改预警忽略代码;

tags/v1.2.0^2
wanjing 1 year ago
parent
commit
d0d435f0bd
4 changed files with 5 additions and 5 deletions
  1. +1
    -1
      tuoheng-admin/src/main/java/com/tuoheng/admin/controller/WarningController.java
  2. +1
    -1
      tuoheng-admin/src/main/java/com/tuoheng/admin/service/warning/confirm/WarningConfirmService.java
  3. +1
    -1
      tuoheng-admin/src/main/java/com/tuoheng/admin/service/warning/ignore/WarningIgnoreService.java
  4. +2
    -2
      tuoheng-admin/src/main/resources/mapper/WarningMapper.xml

+ 1
- 1
tuoheng-admin/src/main/java/com/tuoheng/admin/controller/WarningController.java View File

* 预警确认 * 预警确认
*/ */
@PostMapping("/confirm") @PostMapping("/confirm")
public JsonResult confirm(@RequestBody WarningConfirmRequest request){
public JsonResult confirm(WarningConfirmRequest request){
return warningService.confirm(request); return warningService.confirm(request);
} }



+ 1
- 1
tuoheng-admin/src/main/java/com/tuoheng/admin/service/warning/confirm/WarningConfirmService.java View File

*/ */
private JsonResult check(Integer tenantId, WarningConfirmRequest request) { private JsonResult check(Integer tenantId, WarningConfirmRequest request) {
// 判断预警id是否为空 // 判断预警id是否为空
if (ObjectUtil.isNotNull(request.getId())) {
if (ObjectUtil.isNull(request.getId())) {
throw new ServiceException("预警ID为空"); throw new ServiceException("预警ID为空");
} }
Warning warning = warningMapper.selectOne(new LambdaQueryWrapper<Warning>() Warning warning = warningMapper.selectOne(new LambdaQueryWrapper<Warning>()

+ 1
- 1
tuoheng-admin/src/main/java/com/tuoheng/admin/service/warning/ignore/WarningIgnoreService.java View File

*/ */
private JsonResult check(Integer tenantId, Integer id) { private JsonResult check(Integer tenantId, Integer id) {
// 判断预警id是否为空 // 判断预警id是否为空
if (ObjectUtil.isNotNull(id)) {
if (ObjectUtil.isNull(id)) {
throw new ServiceException("预警ID为空"); throw new ServiceException("预警ID为空");
} }
Warning warning = warningMapper.selectOne(new LambdaQueryWrapper<Warning>() Warning warning = warningMapper.selectOne(new LambdaQueryWrapper<Warning>()

+ 2
- 2
tuoheng-admin/src/main/resources/mapper/WarningMapper.xml View File

</select> </select>


<update id="confirm" parameterType="hashmap"> <update id="confirm" parameterType="hashmap">
update th_inspection_file
update th_warning
<trim prefix="SET" suffixOverrides=","> <trim prefix="SET" suffixOverrides=",">
<if test="status != null"> status = #{status}, </if> <if test="status != null"> status = #{status}, </if>
<if test="updateUser != null and updateUser != ''"> update_user = #{updateUser}, </if> <if test="updateUser != null and updateUser != ''"> update_user = #{updateUser}, </if>
</update> </update>


<update id="ignore" parameterType="hashmap"> <update id="ignore" parameterType="hashmap">
update th_inspection_file
update th_warning
<trim prefix="SET" suffixOverrides=","> <trim prefix="SET" suffixOverrides=",">
<if test="status != null"> status = #{status}, </if> <if test="status != null"> status = #{status}, </if>
<if test="updateUser != null and updateUser != ''"> update_user = #{updateUser}, </if> <if test="updateUser != null and updateUser != ''"> update_user = #{updateUser}, </if>

Loading…
Cancel
Save