From 9a1fc806b7cd4e4e11778f9d3bf51987f8b7908b Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Thu, 22 Feb 2024 11:59:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtdev' into jtdev
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/AttResWaterBlockServiceImpl.java | 25 ++++++++++++++++++++++++-
1 files changed, 24 insertions(+), 1 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/AttResWaterBlockServiceImpl.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/AttResWaterBlockServiceImpl.java
index ae14704..6e9b116 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/AttResWaterBlockServiceImpl.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/AttResWaterBlockServiceImpl.java
@@ -3,11 +3,18 @@
import cn.gistack.sm.sjztmd.entity.AttResWaterBlock;
import cn.gistack.sm.sjztmd.mapper.AttResWaterBlockMapper;
import cn.gistack.sm.sjztmd.service.IAttResWaterBlockService;
+import cn.gistack.system.user.feign.IUserClient;
+import com.alibaba.fastjson.JSONObject;
import com.baomidou.dynamic.datasource.annotation.DS;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.baomidou.mybatisplus.extension.toolkit.SqlHelper;
+import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.utils.DateUtil;
+import org.springblade.core.tool.utils.StringUtil;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+
+import java.util.Date;
/**
* @PROJECT_NAME: skjcmanager
@@ -19,10 +26,26 @@
@DS("zt")
public class AttResWaterBlockServiceImpl extends ServiceImpl<AttResWaterBlockMapper, AttResWaterBlock> implements IAttResWaterBlockService {
+ @Autowired
+ private IUserClient userClient;
@Override
public Boolean updateAttResWaterBlockByResId(AttResWaterBlock attResWaterBlock) {
attResWaterBlock.setUpdateTime(DateUtil.now());
- return SqlHelper.retBool(baseMapper.updateAttResWaterBlockByResId(attResWaterBlock));
+
+ JSONObject paramJson = new JSONObject();
+ paramJson.put("time", DateUtil.format(new Date(),"yyyy-MM-dd"));
+ paramJson.put("editPar", "top_dam_top_elevation：修改值为" + attResWaterBlock.getTbDamTopElevation());
+ paramJson.put("ly", "ywxt");
+ paramJson.put("user_id", AuthUtil.getUserId());
+ paramJson.put("user_name", AuthUtil.getUserName());
+ paramJson.put("phone", userClient.userInfoById(AuthUtil.getUserId()).getData().getPhone());
+ attResWaterBlock.setUpdateBy(paramJson.toJSONString());
+
+ Integer ret = baseMapper.updateAttResWaterBlockByResId(attResWaterBlock);
+ if (ret == 0) {
+ ret = baseMapper.addAttResWaterBlockByResId(attResWaterBlock);
+ }
+ return SqlHelper.retBool(ret);
}
}
--
Gitblit v1.9.3