|
@@ -84,6 +84,10 @@ public class CgglServiceImpl implements CgglService {
|
|
|
|
|
|
private long sliceSize = 10 * 1024 * 1024;
|
|
|
|
|
|
+ //苏木乡镇规划名称
|
|
|
+ private String smxzgh = "苏木乡镇级国土空间规划电子成果数据";
|
|
|
+ private String smxzghtype = "7";
|
|
|
+
|
|
|
@Override
|
|
|
public RequestResult uploadCgFile(MultipartFile file) {
|
|
|
if (file == null) {
|
|
@@ -165,8 +169,9 @@ public class CgglServiceImpl implements CgglService {
|
|
|
|
|
|
@Override
|
|
|
public RequestResult uploadCgInfo(EscalationDTO escalationDTO) {
|
|
|
+ String name = escalationDTO.getName();
|
|
|
QueryWrapper<EscalationDTO> wrapper = new QueryWrapper<EscalationDTO>();
|
|
|
- wrapper.eq("name", escalationDTO.getName());
|
|
|
+ wrapper.eq("name", name);
|
|
|
EscalationDTO res = escalationMapper.selectOne(wrapper);
|
|
|
if (res != null) {
|
|
|
return RequestResult.error("该名称已存在!", false);
|
|
@@ -184,6 +189,16 @@ public class CgglServiceImpl implements CgglService {
|
|
|
{
|
|
|
escalationDTO.setSczt("4");
|
|
|
}
|
|
|
+ //TODO wanger 判断是否为苏木乡镇规划
|
|
|
+ QueryWrapper<EscalationFileDTO> filewrapper = new QueryWrapper<EscalationFileDTO>();
|
|
|
+ filewrapper.eq("id", escalationDTO.getFileid());
|
|
|
+ EscalationFileDTO filedto = escalationFileMapper.selectOne(filewrapper);
|
|
|
+ if(filedto != null){
|
|
|
+ String filename = filedto.getName();
|
|
|
+ if(filename.contains(smxzgh)){
|
|
|
+ escalationDTO.setPlantype(smxzghtype);
|
|
|
+ }
|
|
|
+ }
|
|
|
escalationMapper.insert(escalationDTO);
|
|
|
addCgglRz(escalationDTO);
|
|
|
// FixedThreadUtil.FIXED_THREAD_POOL.execute(() -> {
|