|
@@ -1,44 +1,30 @@
|
|
|
package org.jeecg.modules.weituoyiju.controller;
|
|
|
|
|
|
-import java.util.Arrays;
|
|
|
-import java.util.List;
|
|
|
-import java.util.Map;
|
|
|
-import java.util.stream.Collectors;
|
|
|
-import java.io.IOException;
|
|
|
-import java.io.UnsupportedEncodingException;
|
|
|
-import java.net.URLDecoder;
|
|
|
-import javax.servlet.http.HttpServletRequest;
|
|
|
-import javax.servlet.http.HttpServletResponse;
|
|
|
-
|
|
|
-import org.apache.commons.lang3.StringUtils;
|
|
|
-import org.jeecg.common.api.vo.Result;
|
|
|
-import org.jeecg.common.system.query.QueryGenerator;
|
|
|
-import org.jeecg.common.util.oConvertUtils;
|
|
|
-import org.jeecg.modules.weituoyiju.entity.ItdmWeituoYiju;
|
|
|
-import org.jeecg.modules.weituoyiju.service.IItdmWeituoYijuService;
|
|
|
-
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
|
import com.baomidou.mybatisplus.core.metadata.IPage;
|
|
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
|
+import io.swagger.annotations.Api;
|
|
|
+import io.swagger.annotations.ApiOperation;
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
|
-
|
|
|
-import org.jeecgframework.poi.excel.ExcelImportUtil;
|
|
|
-import org.jeecgframework.poi.excel.def.NormalExcelConstants;
|
|
|
-import org.jeecgframework.poi.excel.entity.ExportParams;
|
|
|
-import org.jeecgframework.poi.excel.entity.ImportParams;
|
|
|
-import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
|
|
|
+import org.apache.commons.lang3.StringUtils;
|
|
|
+import org.jeecg.common.api.vo.Result;
|
|
|
+import org.jeecg.common.aspect.annotation.AutoLog;
|
|
|
import org.jeecg.common.system.base.controller.JeecgController;
|
|
|
+import org.jeecg.common.system.query.QueryGenerator;
|
|
|
+import org.jeecg.modules.weituoyiju.entity.ItdmWeituoYiju;
|
|
|
+import org.jeecg.modules.weituoyiju.service.IItdmWeituoYijuService;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.web.bind.annotation.*;
|
|
|
-import org.springframework.web.multipart.MultipartFile;
|
|
|
-import org.springframework.web.multipart.MultipartHttpServletRequest;
|
|
|
import org.springframework.web.servlet.ModelAndView;
|
|
|
-import com.alibaba.fastjson.JSON;
|
|
|
-import io.swagger.annotations.Api;
|
|
|
-import io.swagger.annotations.ApiOperation;
|
|
|
-import org.jeecg.common.aspect.annotation.AutoLog;
|
|
|
|
|
|
- /**
|
|
|
+import javax.servlet.http.HttpServletRequest;
|
|
|
+import javax.servlet.http.HttpServletResponse;
|
|
|
+import java.util.Arrays;
|
|
|
+import java.util.HashMap;
|
|
|
+import java.util.List;
|
|
|
+import java.util.Map;
|
|
|
+
|
|
|
+/**
|
|
|
* @Description: 委托依据
|
|
|
* @Author: jeecg-boot
|
|
|
* @Date: 2023-05-17
|
|
@@ -51,7 +37,7 @@ import org.jeecg.common.aspect.annotation.AutoLog;
|
|
|
public class ItdmWeituoYijuController extends JeecgController<ItdmWeituoYiju, IItdmWeituoYijuService> {
|
|
|
@Autowired
|
|
|
private IItdmWeituoYijuService itdmWeituoYijuService;
|
|
|
-
|
|
|
+
|
|
|
/**
|
|
|
* 分页列表查询
|
|
|
*
|
|
@@ -76,7 +62,7 @@ public class ItdmWeituoYijuController extends JeecgController<ItdmWeituoYiju, II
|
|
|
IPage<ItdmWeituoYiju> pageList = itdmWeituoYijuService.page(page, queryWrapper);
|
|
|
return Result.OK(pageList);
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
/**
|
|
|
* 添加
|
|
|
*
|
|
@@ -88,10 +74,18 @@ public class ItdmWeituoYijuController extends JeecgController<ItdmWeituoYiju, II
|
|
|
//@RequiresPermissions("org.jeecg.modules:itdm_weituo_yiju:add")
|
|
|
@PostMapping(value = "/add")
|
|
|
public Result<String> add(@RequestBody ItdmWeituoYiju itdmWeituoYiju) {
|
|
|
- itdmWeituoYijuService.save(itdmWeituoYiju);
|
|
|
- return Result.OK("添加成功!");
|
|
|
+ Map<String, Object> columnMap = new HashMap<>();
|
|
|
+ columnMap.put("name",itdmWeituoYiju.getName());
|
|
|
+ List<ItdmWeituoYiju> list = itdmWeituoYijuService.listByMap(columnMap);
|
|
|
+ if(list!=null && !list.isEmpty()){
|
|
|
+ return Result.error("该检测依据 "+ itdmWeituoYiju.getName()+ " 已存在!");
|
|
|
+ }else {
|
|
|
+ itdmWeituoYijuService.save(itdmWeituoYiju);
|
|
|
+ return Result.OK("添加成功!");
|
|
|
+ }
|
|
|
+
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
/**
|
|
|
* 编辑
|
|
|
*
|
|
@@ -103,10 +97,19 @@ public class ItdmWeituoYijuController extends JeecgController<ItdmWeituoYiju, II
|
|
|
//@RequiresPermissions("org.jeecg.modules:itdm_weituo_yiju:edit")
|
|
|
@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
|
|
|
public Result<String> edit(@RequestBody ItdmWeituoYiju itdmWeituoYiju) {
|
|
|
+ ItdmWeituoYiju itdmWeituoYiju1 = itdmWeituoYijuService.getById(itdmWeituoYiju.getId());
|
|
|
+ if( !itdmWeituoYiju1.getName().equals(itdmWeituoYiju.getName()) ){
|
|
|
+ Map<String, Object> columnMap = new HashMap<>();
|
|
|
+ columnMap.put("name",itdmWeituoYiju.getName());
|
|
|
+ List<ItdmWeituoYiju> list = itdmWeituoYijuService.listByMap(columnMap);
|
|
|
+ if(list!=null && !list.isEmpty()){
|
|
|
+ return Result.error("该检测依据 "+ itdmWeituoYiju.getName()+ " 已存在!");
|
|
|
+ }
|
|
|
+ }
|
|
|
itdmWeituoYijuService.updateById(itdmWeituoYiju);
|
|
|
return Result.OK("编辑成功!");
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
/**
|
|
|
* 通过id删除
|
|
|
*
|
|
@@ -121,7 +124,7 @@ public class ItdmWeituoYijuController extends JeecgController<ItdmWeituoYiju, II
|
|
|
itdmWeituoYijuService.removeById(id);
|
|
|
return Result.OK("删除成功!");
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
/**
|
|
|
* 批量删除
|
|
|
*
|
|
@@ -136,7 +139,7 @@ public class ItdmWeituoYijuController extends JeecgController<ItdmWeituoYiju, II
|
|
|
this.itdmWeituoYijuService.removeByIds(Arrays.asList(ids.split(",")));
|
|
|
return Result.OK("批量删除成功!");
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
/**
|
|
|
* 通过id查询
|
|
|
*
|