|
@@ -34,8 +34,8 @@ import java.util.*;
|
|
@RestController
|
|
@RestController
|
|
@RequestMapping("/BreedResources")
|
|
@RequestMapping("/BreedResources")
|
|
@Api(tags = "养殖资源信息控制器")
|
|
@Api(tags = "养殖资源信息控制器")
|
|
-public class CenterdataTFarmBreedResourcesController extends BaseController
|
|
|
|
-{
|
|
|
|
|
|
+public class CenterdataTFarmBreedResourcesController extends BaseController {
|
|
|
|
+
|
|
@Autowired
|
|
@Autowired
|
|
private ICenterdataTFarmBreedResourcesService centerdataTFarmBreedResourcesService;
|
|
private ICenterdataTFarmBreedResourcesService centerdataTFarmBreedResourcesService;
|
|
|
|
|
|
@@ -43,18 +43,15 @@ public class CenterdataTFarmBreedResourcesController extends BaseController
|
|
* 查询养殖资源信息列表
|
|
* 查询养殖资源信息列表
|
|
*/
|
|
*/
|
|
@ApiOperation(value = "查询养殖资源信息列表", notes = "查询养殖资源信息列表")
|
|
@ApiOperation(value = "查询养殖资源信息列表", notes = "查询养殖资源信息列表")
|
|
-
|
|
|
|
@RequiresPermissions("breed_resources:BreedResources:list")
|
|
@RequiresPermissions("breed_resources:BreedResources:list")
|
|
@GetMapping("/list")
|
|
@GetMapping("/list")
|
|
- public TableDataInfo list(CenterdataTFarmBreedResources centerdataTFarmBreedResources)
|
|
|
|
- {
|
|
|
|
|
|
+ public TableDataInfo list(CenterdataTFarmBreedResources centerdataTFarmBreedResources) {
|
|
startPage();
|
|
startPage();
|
|
List<CenterdataTFarmBreedResources> list = centerdataTFarmBreedResourcesService.selectCenterdataTFarmBreedResourcesList(centerdataTFarmBreedResources);
|
|
List<CenterdataTFarmBreedResources> list = centerdataTFarmBreedResourcesService.selectCenterdataTFarmBreedResourcesList(centerdataTFarmBreedResources);
|
|
return getDataTable(list);
|
|
return getDataTable(list);
|
|
}
|
|
}
|
|
|
|
|
|
@ApiOperation(value = "养殖资源信息管理导入", notes = "养殖资源信息管理导入")
|
|
@ApiOperation(value = "养殖资源信息管理导入", notes = "养殖资源信息管理导入")
|
|
-
|
|
|
|
@Log(title = "养殖资源信息管理导入", businessType = BusinessType.IMPORT)
|
|
@Log(title = "养殖资源信息管理导入", businessType = BusinessType.IMPORT)
|
|
@RequiresPermissions("machinery_info:MachineryInfo:import")
|
|
@RequiresPermissions("machinery_info:MachineryInfo:import")
|
|
@PostMapping("/import/importData")
|
|
@PostMapping("/import/importData")
|
|
@@ -68,7 +65,7 @@ public class CenterdataTFarmBreedResourcesController extends BaseController
|
|
|
|
|
|
@ApiOperation(value = "养殖资源信息管理导入模板", notes = "养殖资源信息管理导入模板")
|
|
@ApiOperation(value = "养殖资源信息管理导入模板", notes = "养殖资源信息管理导入模板")
|
|
@PostMapping("/importTemplate")
|
|
@PostMapping("/importTemplate")
|
|
- public void importTemplate(HttpServletResponse response) {
|
|
|
|
|
|
+ public void importTemplate(HttpServletResponse response) {
|
|
ExcelUtil<CenterdataTFarmBreedResources> util = new ExcelUtil<>(CenterdataTFarmBreedResources.class);
|
|
ExcelUtil<CenterdataTFarmBreedResources> util = new ExcelUtil<>(CenterdataTFarmBreedResources.class);
|
|
util.importTemplateExcel(response, "养殖资源信息数据");
|
|
util.importTemplateExcel(response, "养殖资源信息数据");
|
|
}
|
|
}
|
|
@@ -77,12 +74,10 @@ public class CenterdataTFarmBreedResourcesController extends BaseController
|
|
* 导出养殖资源信息列表
|
|
* 导出养殖资源信息列表
|
|
*/
|
|
*/
|
|
@ApiOperation(value = "导出养殖资源信息列表", notes = "导出养殖资源信息列表")
|
|
@ApiOperation(value = "导出养殖资源信息列表", notes = "导出养殖资源信息列表")
|
|
-
|
|
|
|
@RequiresPermissions("breed_resources:BreedResources:export")
|
|
@RequiresPermissions("breed_resources:BreedResources:export")
|
|
@Log(title = "养殖资源信息", businessType = BusinessType.EXPORT)
|
|
@Log(title = "养殖资源信息", businessType = BusinessType.EXPORT)
|
|
@PostMapping("/export")
|
|
@PostMapping("/export")
|
|
- public void export(HttpServletResponse response, CenterdataTFarmBreedResources centerdataTFarmBreedResources)
|
|
|
|
- {
|
|
|
|
|
|
+ public void export(HttpServletResponse response, CenterdataTFarmBreedResources centerdataTFarmBreedResources) {
|
|
List<CenterdataTFarmBreedResources> list = centerdataTFarmBreedResourcesService.selectCenterdataTFarmBreedResourcesList(centerdataTFarmBreedResources);
|
|
List<CenterdataTFarmBreedResources> list = centerdataTFarmBreedResourcesService.selectCenterdataTFarmBreedResourcesList(centerdataTFarmBreedResources);
|
|
ExcelUtil<CenterdataTFarmBreedResources> util = new ExcelUtil<>(CenterdataTFarmBreedResources.class);
|
|
ExcelUtil<CenterdataTFarmBreedResources> util = new ExcelUtil<>(CenterdataTFarmBreedResources.class);
|
|
util.exportExcel(response, list, "养殖资源信息数据");
|
|
util.exportExcel(response, list, "养殖资源信息数据");
|
|
@@ -92,11 +87,9 @@ public class CenterdataTFarmBreedResourcesController extends BaseController
|
|
* 获取养殖资源信息详细信息
|
|
* 获取养殖资源信息详细信息
|
|
*/
|
|
*/
|
|
@ApiOperation(value = "获取养殖资源信息详细信息", notes = "获取养殖资源信息详细信息")
|
|
@ApiOperation(value = "获取养殖资源信息详细信息", notes = "获取养殖资源信息详细信息")
|
|
-
|
|
|
|
@RequiresPermissions("breed_resources:BreedResources:query")
|
|
@RequiresPermissions("breed_resources:BreedResources:query")
|
|
@GetMapping(value = "/{id}")
|
|
@GetMapping(value = "/{id}")
|
|
- public AjaxResult getInfo(@PathVariable("id") String id)
|
|
|
|
- {
|
|
|
|
|
|
+ public AjaxResult getInfo(@PathVariable("id") String id) {
|
|
return AjaxResult.success(centerdataTFarmBreedResourcesService.selectCenterdataTFarmBreedResourcesById(id));
|
|
return AjaxResult.success(centerdataTFarmBreedResourcesService.selectCenterdataTFarmBreedResourcesById(id));
|
|
}
|
|
}
|
|
|
|
|
|
@@ -104,15 +97,14 @@ public class CenterdataTFarmBreedResourcesController extends BaseController
|
|
* 新增养殖资源信息
|
|
* 新增养殖资源信息
|
|
*/
|
|
*/
|
|
@ApiOperation(value = "新增养殖资源信息", notes = "新增养殖资源信息")
|
|
@ApiOperation(value = "新增养殖资源信息", notes = "新增养殖资源信息")
|
|
-
|
|
|
|
@RequiresPermissions("breed_resources:BreedResources:add")
|
|
@RequiresPermissions("breed_resources:BreedResources:add")
|
|
@Log(title = "养殖资源信息", businessType = BusinessType.INSERT)
|
|
@Log(title = "养殖资源信息", businessType = BusinessType.INSERT)
|
|
@PostMapping
|
|
@PostMapping
|
|
- public AjaxResult add(@Validated @RequestBody CenterdataTFarmBreedResources centerdataTFarmBreedResources){
|
|
|
|
|
|
+ public AjaxResult add(@Validated @RequestBody CenterdataTFarmBreedResources centerdataTFarmBreedResources) {
|
|
String tableName = "centerdata_t_farm_breed_resources";
|
|
String tableName = "centerdata_t_farm_breed_resources";
|
|
- String[] keys = {"name","dept_id"};
|
|
|
|
|
|
+ String[] keys = {"name", "dept_id"};
|
|
String[] values = {centerdataTFarmBreedResources.getName(), centerdataTFarmBreedResources.getDeptId()};
|
|
String[] values = {centerdataTFarmBreedResources.getName(), centerdataTFarmBreedResources.getDeptId()};
|
|
- if(!centerdataTFarmBreedResourcesService.uniqueCheck(tableName, keys, values)){
|
|
|
|
|
|
+ if (!centerdataTFarmBreedResourcesService.uniqueCheck(tableName, keys, values)) {
|
|
return AjaxResult.error(DataConstants.ERROR_MSG);
|
|
return AjaxResult.error(DataConstants.ERROR_MSG);
|
|
}
|
|
}
|
|
return toAjax(centerdataTFarmBreedResourcesService.insertCenterdataTFarmBreedResources(centerdataTFarmBreedResources));
|
|
return toAjax(centerdataTFarmBreedResourcesService.insertCenterdataTFarmBreedResources(centerdataTFarmBreedResources));
|
|
@@ -122,16 +114,14 @@ public class CenterdataTFarmBreedResourcesController extends BaseController
|
|
* 修改养殖资源信息
|
|
* 修改养殖资源信息
|
|
*/
|
|
*/
|
|
@ApiOperation(value = "修改养殖资源信息", notes = "修改养殖资源信息")
|
|
@ApiOperation(value = "修改养殖资源信息", notes = "修改养殖资源信息")
|
|
-
|
|
|
|
@RequiresPermissions("breed_resources:BreedResources:edit")
|
|
@RequiresPermissions("breed_resources:BreedResources:edit")
|
|
@Log(title = "养殖资源信息", businessType = BusinessType.UPDATE)
|
|
@Log(title = "养殖资源信息", businessType = BusinessType.UPDATE)
|
|
@PutMapping
|
|
@PutMapping
|
|
- public AjaxResult edit(@Validated @RequestBody CenterdataTFarmBreedResources centerdataTFarmBreedResources)
|
|
|
|
- {
|
|
|
|
|
|
+ public AjaxResult edit(@Validated @RequestBody CenterdataTFarmBreedResources centerdataTFarmBreedResources) {
|
|
String tableName = "centerdata_t_farm_breed_resources";
|
|
String tableName = "centerdata_t_farm_breed_resources";
|
|
- String[] keys = {"name","id"};
|
|
|
|
- String[] values = {centerdataTFarmBreedResources.getName(),centerdataTFarmBreedResources.getId()};
|
|
|
|
- if(!centerdataTFarmBreedResourcesService.uniqueCheck(tableName, keys, values)){
|
|
|
|
|
|
+ String[] keys = {"name", "id"};
|
|
|
|
+ String[] values = {centerdataTFarmBreedResources.getName(), centerdataTFarmBreedResources.getId()};
|
|
|
|
+ if (!centerdataTFarmBreedResourcesService.uniqueCheck(tableName, keys, values)) {
|
|
return AjaxResult.error(DataConstants.ERROR_MSG);
|
|
return AjaxResult.error(DataConstants.ERROR_MSG);
|
|
}
|
|
}
|
|
return toAjax(centerdataTFarmBreedResourcesService.updateCenterdataTFarmBreedResources(centerdataTFarmBreedResources));
|
|
return toAjax(centerdataTFarmBreedResourcesService.updateCenterdataTFarmBreedResources(centerdataTFarmBreedResources));
|
|
@@ -141,12 +131,10 @@ public class CenterdataTFarmBreedResourcesController extends BaseController
|
|
* 删除养殖资源信息
|
|
* 删除养殖资源信息
|
|
*/
|
|
*/
|
|
@ApiOperation(value = "删除养殖资源信息", notes = "删除养殖资源信息")
|
|
@ApiOperation(value = "删除养殖资源信息", notes = "删除养殖资源信息")
|
|
-
|
|
|
|
@RequiresPermissions("breed_resources:BreedResources:remove")
|
|
@RequiresPermissions("breed_resources:BreedResources:remove")
|
|
@Log(title = "养殖资源信息", businessType = BusinessType.DELETE)
|
|
@Log(title = "养殖资源信息", businessType = BusinessType.DELETE)
|
|
@DeleteMapping("/{ids}")
|
|
@DeleteMapping("/{ids}")
|
|
- public AjaxResult remove(@PathVariable String[] ids)
|
|
|
|
- {
|
|
|
|
|
|
+ public AjaxResult remove(@PathVariable String[] ids) {
|
|
return toAjax(centerdataTFarmBreedResourcesService.deleteCenterdataTFarmBreedResourcesByIds(ids));
|
|
return toAjax(centerdataTFarmBreedResourcesService.deleteCenterdataTFarmBreedResourcesByIds(ids));
|
|
}
|
|
}
|
|
|
|
|
|
@@ -154,8 +142,7 @@ public class CenterdataTFarmBreedResourcesController extends BaseController
|
|
//数字农业远端调用
|
|
//数字农业远端调用
|
|
@ApiOperation(value = "远端调用查询养殖资源信息", notes = "远端调用查询养殖资源信息")
|
|
@ApiOperation(value = "远端调用查询养殖资源信息", notes = "远端调用查询养殖资源信息")
|
|
@GetMapping("/YangZhilistFen")
|
|
@GetMapping("/YangZhilistFen")
|
|
- public TableDataInfo YangZhilistFen(CenterdataTFarmBreedResources centerdataTFarmBreedResources)
|
|
|
|
- {
|
|
|
|
|
|
+ public TableDataInfo yangZhilistFen(CenterdataTFarmBreedResources centerdataTFarmBreedResources) {
|
|
startPage();
|
|
startPage();
|
|
List<CenterdataTFarmBreedResources> list = centerdataTFarmBreedResourcesService.selectCenterdataTFarmBreedResourcesList(centerdataTFarmBreedResources);
|
|
List<CenterdataTFarmBreedResources> list = centerdataTFarmBreedResourcesService.selectCenterdataTFarmBreedResourcesList(centerdataTFarmBreedResources);
|
|
return getDataTable(list);
|
|
return getDataTable(list);
|
|
@@ -164,17 +151,16 @@ public class CenterdataTFarmBreedResourcesController extends BaseController
|
|
// 大数据-养殖数据分析
|
|
// 大数据-养殖数据分析
|
|
@ApiOperation(value = "大数据-养殖数据分析", notes = "大数据-养殖数据分析")
|
|
@ApiOperation(value = "大数据-养殖数据分析", notes = "大数据-养殖数据分析")
|
|
@GetMapping("/breedDataAnalysis")
|
|
@GetMapping("/breedDataAnalysis")
|
|
- public R breedDataAnalysis(CenterdataTFarmBreedResources centerdataTFarmBreedResources)
|
|
|
|
- {
|
|
|
|
- List<Map<String,Object>> list = centerdataTFarmBreedResourcesService.breedDataAnalysis(centerdataTFarmBreedResources);
|
|
|
|
|
|
+ public R breedDataAnalysis(CenterdataTFarmBreedResources centerdataTFarmBreedResources) {
|
|
|
|
+ List<Map<String, Object>> list = centerdataTFarmBreedResourcesService.breedDataAnalysis(centerdataTFarmBreedResources);
|
|
List<String> types = new ArrayList<>();
|
|
List<String> types = new ArrayList<>();
|
|
MultiValueMap<String, Object> countMap = new LinkedMultiValueMap<>();
|
|
MultiValueMap<String, Object> countMap = new LinkedMultiValueMap<>();
|
|
list.forEach(item -> {
|
|
list.forEach(item -> {
|
|
- types.add(MapUtils.getString(item,"dict_label"));
|
|
|
|
|
|
+ types.add(MapUtils.getString(item, "dict_label"));
|
|
|
|
|
|
- String key = MapUtils.getString(item,"dict_value");
|
|
|
|
- countMap.add(key + "_quantity", MapUtils.getLong(item,"quantity"));
|
|
|
|
- countMap.add(key + "_revenue", MapUtils.getLong(item,"revenue"));
|
|
|
|
|
|
+ String key = MapUtils.getString(item, "dict_value");
|
|
|
|
+ countMap.add(key + "_quantity", MapUtils.getLong(item, "quantity"));
|
|
|
|
+ countMap.add(key + "_revenue", MapUtils.getLong(item, "revenue"));
|
|
});
|
|
});
|
|
// 返回值
|
|
// 返回值
|
|
Map<String, Object> resultMap = new HashMap<>();
|
|
Map<String, Object> resultMap = new HashMap<>();
|
|
@@ -197,8 +183,8 @@ public class CenterdataTFarmBreedResourcesController extends BaseController
|
|
}
|
|
}
|
|
resultMap.put("series", series);
|
|
resultMap.put("series", series);
|
|
map = centerdataTFarmBreedResourcesService.getBreedDataCount(centerdataTFarmBreedResources);
|
|
map = centerdataTFarmBreedResourcesService.getBreedDataCount(centerdataTFarmBreedResources);
|
|
- resultMap.put("breedFarm", MapUtils.getLong(map,"breedFarm"));
|
|
|
|
- resultMap.put("breedFarmer", MapUtils.getLong(map,"breedFarmer"));
|
|
|
|
|
|
+ resultMap.put("breedFarm", MapUtils.getLong(map, "breedFarm"));
|
|
|
|
+ resultMap.put("breedFarmer", MapUtils.getLong(map, "breedFarmer"));
|
|
return R.ok(resultMap);
|
|
return R.ok(resultMap);
|
|
}
|
|
}
|
|
}
|
|
}
|