hbwri/skjcmanager.git

			@@ -5,23 +5,24 @@
			import cn.gistack.sm.sjztmd.entity.AttAdBase;
			import cn.gistack.sm.sjztmd.entity.AttResBase;
			import cn.gistack.sm.sjztmd.entity.RelResLabel;
			import cn.gistack.sm.sjztmd.excel.AttResBaseUserExcel;
			import cn.gistack.sm.sjztmd.mapper.AttResBaseMapper;
			import cn.gistack.sm.sjztmd.service.IAttResBaseService;
			import cn.gistack.sm.sjztmd.service.IRelResLabelService;
			import cn.gistack.sm.sjztmd.vo.*;
			import cn.gistack.system.feign.ISysClient;
			import com.baomidou.dynamic.datasource.annotation.DS;
			import com.baomidou.mybatisplus.core.metadata.IPage;
			import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
			import org.springblade.core.secure.BladeUser;
			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 org.springframework.transaction.annotation.Transactional;
			import org.springframework.web.bind.annotation.RequestParam;

			import java.util.ArrayList;
			import java.util.HashMap;
			import java.util.List;
			import java.util.Map;
			import java.util.*;

			/**
			* @ClassName AttResBaseServiceImpl
			@@ -40,6 +41,9 @@
			@Autowired
			private IRelResLabelService relResLabelService;

			@Autowired
			private ISysClient sysClient;


			@Override
			public IPage<AttResBase> selectAttResBasePage(IPage<AttResBase> page, AttResBase attResBase) {
			@@ -57,7 +61,7 @@
			}

			@Override
			public IPage<AttResBase> getListByRegion(IPage<AttResBase> page,Map<String, Object> obj) {
			public IPage<AttResBaseVO> getListByRegion(IPage<AttResBaseVO> page,Map<String, Object> obj) {
			return page.setRecords(baseMapper.getListByRegion(page,obj));
			}

			@@ -85,16 +89,59 @@
			return page.setRecords(attResBaseUserDTOList);
			}


			@Override
			public List<AttResBaseUserExcel> exportAttResBaseUser(Map<String, Object> params) {


			List<AttResBaseUserExcel> attResBaseUserDTOList = baseMapper.getAttResBaseUserExcel(params);
			return attResBaseUserDTOList;
			}

			@Override
			@Transactional(rollbackFor = Exception.class)
			public Boolean updateResBaseByGuid(AttResBase attResBase) {
			attResBase.setUpdateTime(DateUtil.now());

			String updateBy = baseMapper.getUpdateLog(attResBase.getGuid());
			if (StringUtil.isBlank(updateBy)){
			updateBy = "";
			}
			BladeUser user = AuthUtil.getUser();
			//修改人基础信息
			String account = user.getAccount();
			String userName = user.getUserName();
			String nowTime = DateUtil.format(DateUtil.now(),DateUtil.PATTERN_DATETIME);

			String updateUser = StringUtil.format("[{}-{}-{}]",account,userName,nowTime);

			//修改的东西
			String interiorAdGuid = attResBase.getInteriorAdGuid();
			String label = attResBase.getLabel();
			String heightBaseStdTp = attResBase.getHeightBaseStdTp();
			String isGate = attResBase.getIsGate();

			String updateLog = "";
			List<String> strList = new ArrayList<>();
			if (StringUtil.isNotBlank(interiorAdGuid)){
			strList.add("行政区划修改为"+ interiorAdGuid);
			}
			strList.add("标签修改为"+label);
			strList.add("高程基准面修改为"+heightBaseStdTp);
			strList.add("是否有闸修改为"+isGate);

			String updateContent = String.join("、",strList);

			updateLog = updateUser + updateContent + ";";
			updateBy = updateBy + updateLog;
			//向水库标签表中更新数据
			relResLabelService.updateEntity(attResBase.getGuid(),attResBase.getLabel());

			//更新机构表中的水库位置
			sysClient.updateDeptByTb(interiorAdGuid,attResBase.getGuid());

			//向操作记录表中增加记录
			baseMapper.updateRelResUpdateLoc(attResBase.getGuid(),updateBy);
			return baseMapper.updateResBaseByGuid(attResBase);
			}

			@@ -148,4 +195,5 @@
			public AttAdBase getYwxtResInfo(String cityName, String countyName) {
			return baseMapper.getYwxtResInfo(cityName,countyName);
			}

			}