|
|
@ -1,44 +1,45 @@
|
|
|
|
package jnpf.controller;
|
|
|
|
package jnpf.controller;
|
|
|
|
|
|
|
|
|
|
|
|
import cn.hutool.core.util.ObjectUtil;
|
|
|
|
|
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
|
|
|
|
|
|
import io.swagger.v3.oas.annotations.Operation;
|
|
|
|
import io.swagger.v3.oas.annotations.Operation;
|
|
|
|
import io.swagger.v3.oas.annotations.tags.Tag;
|
|
|
|
import io.swagger.v3.oas.annotations.tags.Tag;
|
|
|
|
import jnpf.base.ActionResult;
|
|
|
|
import jnpf.base.ActionResult;
|
|
|
|
import jnpf.base.UserInfo;
|
|
|
|
import jnpf.base.vo.PageListVO;
|
|
|
|
import jnpf.exception.DataException;
|
|
|
|
import jnpf.base.vo.PaginationVO;
|
|
|
|
import jnpf.permission.entity.UserEntity;
|
|
|
|
import jnpf.entity.StationAreaEntity;
|
|
|
|
import jnpf.service.*;
|
|
|
|
import jnpf.model.stationarea.Position;
|
|
|
|
import jnpf.entity.*;
|
|
|
|
import jnpf.model.stationarea.StationAreaConstant;
|
|
|
|
import jnpf.util.*;
|
|
|
|
import jnpf.model.stationarea.StationAreaForm;
|
|
|
|
import jnpf.model.stationarea.*;
|
|
|
|
import jnpf.model.stationarea.StationAreaPagination;
|
|
|
|
|
|
|
|
import jnpf.service.EnterpriserecyclestationService;
|
|
|
|
|
|
|
|
import jnpf.service.StationAreaService;
|
|
|
|
|
|
|
|
import jnpf.util.GeneraterSwapUtil;
|
|
|
|
|
|
|
|
import jnpf.util.JsonUtil;
|
|
|
|
|
|
|
|
import jnpf.util.StringUtil;
|
|
|
|
|
|
|
|
import jnpf.util.UserProvider;
|
|
|
|
|
|
|
|
import jnpf.utils.AreaUtil;
|
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
|
|
|
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
|
|
import org.springframework.web.bind.annotation.*;
|
|
|
|
import org.springframework.web.bind.annotation.*;
|
|
|
|
|
|
|
|
|
|
|
|
import javax.validation.Valid;
|
|
|
|
import javax.validation.Valid;
|
|
|
|
import java.util.*;
|
|
|
|
|
|
|
|
import jnpf.annotation.JnpfField;
|
|
|
|
|
|
|
|
import jnpf.base.vo.PageListVO;
|
|
|
|
|
|
|
|
import jnpf.base.vo.PaginationVO;
|
|
|
|
|
|
|
|
import jnpf.base.vo.DownloadVO;
|
|
|
|
|
|
|
|
import jnpf.config.ConfigValueUtil;
|
|
|
|
|
|
|
|
import jnpf.base.entity.ProvinceEntity;
|
|
|
|
|
|
|
|
import java.io.IOException;
|
|
|
|
import java.io.IOException;
|
|
|
|
import java.util.stream.Collectors;
|
|
|
|
import java.math.BigDecimal;
|
|
|
|
import jnpf.engine.entity.FlowTaskEntity;
|
|
|
|
import java.util.ArrayList;
|
|
|
|
import jnpf.exception.WorkFlowException;
|
|
|
|
import java.util.List;
|
|
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
|
|
import java.util.Map;
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
/**
|
|
|
|
* 回收站电子围栏
|
|
|
|
* 商户经营区域
|
|
|
|
|
|
|
|
*
|
|
|
|
* @版本: V3.5
|
|
|
|
* @版本: V3.5
|
|
|
|
* @版权: 引迈信息技术有限公司(https://www.jnpfsoft.com)
|
|
|
|
* @版权: 引迈信息技术有限公司(https://www.jnpfsoft.com)
|
|
|
|
* @作者: JNPF开发平台组
|
|
|
|
* @作者: JNPF开发平台组
|
|
|
|
* @日期: 2024-05-20
|
|
|
|
* @日期: 2024-05-21
|
|
|
|
*/
|
|
|
|
*/
|
|
|
|
@Slf4j
|
|
|
|
@Slf4j
|
|
|
|
@RestController
|
|
|
|
@RestController
|
|
|
|
@Tag(name = "回收站电子围栏" , description = "scm")
|
|
|
|
@Tag(name = "商户经营区域", description = "scm")
|
|
|
|
@RequestMapping("/api/scm/StationArea")
|
|
|
|
@RequestMapping("/api/scm/StationArea")
|
|
|
|
public class StationAreaController {
|
|
|
|
public class StationAreaController {
|
|
|
|
|
|
|
|
|
|
|
@ -50,29 +51,30 @@ public class StationAreaController {
|
|
|
|
|
|
|
|
|
|
|
|
@Autowired
|
|
|
|
@Autowired
|
|
|
|
private StationAreaService stationAreaService;
|
|
|
|
private StationAreaService stationAreaService;
|
|
|
|
|
|
|
|
@Autowired
|
|
|
|
|
|
|
|
private EnterpriserecyclestationService stationService;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
/**
|
|
|
|
* 列表
|
|
|
|
* 列表
|
|
|
|
*
|
|
|
|
*
|
|
|
|
* @param stationAreaPagination
|
|
|
|
* @param stationAreaPagination
|
|
|
|
* @return
|
|
|
|
* @return
|
|
|
|
*/
|
|
|
|
*/
|
|
|
|
@Operation(summary = "获取列表")
|
|
|
|
@Operation(summary = "获取列表")
|
|
|
|
@PostMapping("/getList")
|
|
|
|
@PostMapping("/getList")
|
|
|
|
public ActionResult list(@RequestBody StationAreaPagination stationAreaPagination)throws IOException{
|
|
|
|
public ActionResult list(@RequestBody StationAreaPagination stationAreaPagination) throws IOException {
|
|
|
|
List<StationAreaEntity> list= stationAreaService.getList(stationAreaPagination);
|
|
|
|
List<StationAreaEntity> list = stationAreaService.getList(stationAreaPagination);
|
|
|
|
List<Map<String, Object>> realList=new ArrayList<>();
|
|
|
|
List<Map<String, Object>> realList = new ArrayList<>();
|
|
|
|
for (StationAreaEntity entity : list) {
|
|
|
|
for (StationAreaEntity entity : list) {
|
|
|
|
Map<String, Object> stationAreaMap=JsonUtil.entityToMap(entity);
|
|
|
|
Map<String, Object> stationAreaMap = JsonUtil.entityToMap(entity);
|
|
|
|
stationAreaMap.put("id", stationAreaMap.get("id"));
|
|
|
|
stationAreaMap.put("id", stationAreaMap.get("id"));
|
|
|
|
//副表数据
|
|
|
|
//副表数据
|
|
|
|
//子表数据
|
|
|
|
//子表数据
|
|
|
|
realList.add(stationAreaMap);
|
|
|
|
realList.add(stationAreaMap);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
//数据转换
|
|
|
|
//数据转换
|
|
|
|
realList = generaterSwapUtil.swapDataList(realList, StationAreaConstant.getFormData(), StationAreaConstant.getColumnData(), stationAreaPagination.getModuleId(),false);
|
|
|
|
realList = generaterSwapUtil.swapDataList(realList, StationAreaConstant.getFormData(), StationAreaConstant.getColumnData(), stationAreaPagination.getModuleId(), false);
|
|
|
|
|
|
|
|
|
|
|
|
//返回对象
|
|
|
|
//返回对象
|
|
|
|
PageListVO vo = new PageListVO();
|
|
|
|
PageListVO vo = new PageListVO();
|
|
|
@ -81,110 +83,164 @@ public class StationAreaController {
|
|
|
|
vo.setPagination(page);
|
|
|
|
vo.setPagination(page);
|
|
|
|
return ActionResult.success(vo);
|
|
|
|
return ActionResult.success(vo);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
/**
|
|
|
|
* 创建
|
|
|
|
* 创建
|
|
|
|
*
|
|
|
|
*
|
|
|
|
* @param stationAreaForm
|
|
|
|
* @param stationAreaForm
|
|
|
|
* @return
|
|
|
|
* @return
|
|
|
|
*/
|
|
|
|
*/
|
|
|
|
@PostMapping()
|
|
|
|
@PostMapping()
|
|
|
|
@Operation(summary = "创建")
|
|
|
|
@Operation(summary = "创建")
|
|
|
|
public ActionResult create(@RequestBody @Valid StationAreaForm stationAreaForm) {
|
|
|
|
public ActionResult create(@RequestBody @Valid StationAreaForm stationAreaForm) {
|
|
|
|
String b = stationAreaService.checkForm(stationAreaForm,0);
|
|
|
|
String b = stationAreaService.checkForm(stationAreaForm, 0);
|
|
|
|
if (StringUtil.isNotEmpty(b)){
|
|
|
|
if (StringUtil.isNotEmpty(b)) {
|
|
|
|
return ActionResult.fail(b );
|
|
|
|
return ActionResult.fail(b);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
try{
|
|
|
|
try {
|
|
|
|
stationAreaService.saveOrUpdate(stationAreaForm, null ,true);
|
|
|
|
stationAreaService.saveOrUpdate(stationAreaForm, null, true);
|
|
|
|
}catch(Exception e){
|
|
|
|
} catch (Exception e) {
|
|
|
|
return ActionResult.fail("新增数据失败");
|
|
|
|
return ActionResult.fail("新增数据失败");
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return ActionResult.success("创建成功");
|
|
|
|
return ActionResult.success("创建成功");
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
/**
|
|
|
|
* 编辑
|
|
|
|
* 编辑
|
|
|
|
* @param id
|
|
|
|
*
|
|
|
|
* @param stationAreaForm
|
|
|
|
* @param id
|
|
|
|
* @return
|
|
|
|
* @param stationAreaForm
|
|
|
|
*/
|
|
|
|
* @return
|
|
|
|
|
|
|
|
*/
|
|
|
|
@PutMapping("/{id}")
|
|
|
|
@PutMapping("/{id}")
|
|
|
|
@Operation(summary = "更新")
|
|
|
|
@Operation(summary = "更新")
|
|
|
|
public ActionResult update(@PathVariable("id") String id,@RequestBody @Valid StationAreaForm stationAreaForm,
|
|
|
|
public ActionResult update(@PathVariable("id") String id, @RequestBody @Valid StationAreaForm stationAreaForm,
|
|
|
|
@RequestParam(value = "isImport", required = false) boolean isImport){
|
|
|
|
@RequestParam(value = "isImport", required = false) boolean isImport) {
|
|
|
|
stationAreaForm.setId(id);
|
|
|
|
stationAreaForm.setId(id);
|
|
|
|
if (!isImport) {
|
|
|
|
if (!isImport) {
|
|
|
|
String b = stationAreaService.checkForm(stationAreaForm,1);
|
|
|
|
String b = stationAreaService.checkForm(stationAreaForm, 1);
|
|
|
|
if (StringUtil.isNotEmpty(b)){
|
|
|
|
if (StringUtil.isNotEmpty(b)) {
|
|
|
|
return ActionResult.fail(b );
|
|
|
|
return ActionResult.fail(b);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
StationAreaEntity entity= stationAreaService.getInfo(id);
|
|
|
|
StationAreaEntity entity = stationAreaService.getInfo(id);
|
|
|
|
if(entity!=null){
|
|
|
|
if (entity != null) {
|
|
|
|
try{
|
|
|
|
try {
|
|
|
|
stationAreaService.saveOrUpdate(stationAreaForm,id,false);
|
|
|
|
stationAreaService.saveOrUpdate(stationAreaForm, id, false);
|
|
|
|
}catch(Exception e){
|
|
|
|
} catch (Exception e) {
|
|
|
|
return ActionResult.fail("修改数据失败");
|
|
|
|
return ActionResult.fail("修改数据失败");
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return ActionResult.success("更新成功");
|
|
|
|
return ActionResult.success("更新成功");
|
|
|
|
}else{
|
|
|
|
} else {
|
|
|
|
return ActionResult.fail("更新失败,数据不存在");
|
|
|
|
return ActionResult.fail("更新失败,数据不存在");
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
/**
|
|
|
|
* 删除
|
|
|
|
* 删除
|
|
|
|
* @param id
|
|
|
|
*
|
|
|
|
* @return
|
|
|
|
* @param id
|
|
|
|
*/
|
|
|
|
* @return
|
|
|
|
|
|
|
|
*/
|
|
|
|
@Operation(summary = "删除")
|
|
|
|
@Operation(summary = "删除")
|
|
|
|
@DeleteMapping("/{id}")
|
|
|
|
@DeleteMapping("/{id}")
|
|
|
|
@Transactional
|
|
|
|
@Transactional
|
|
|
|
public ActionResult delete(@PathVariable("id") String id){
|
|
|
|
public ActionResult delete(@PathVariable("id") String id) {
|
|
|
|
StationAreaEntity entity= stationAreaService.getInfo(id);
|
|
|
|
StationAreaEntity entity = stationAreaService.getInfo(id);
|
|
|
|
if(entity!=null){
|
|
|
|
if (entity != null) {
|
|
|
|
//主表数据删除
|
|
|
|
//主表数据删除
|
|
|
|
stationAreaService.delete(entity);
|
|
|
|
stationAreaService.delete(entity);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return ActionResult.success("删除成功");
|
|
|
|
return ActionResult.success("删除成功");
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
/**
|
|
|
|
* 表单信息(详情页)
|
|
|
|
* 表单信息(详情页)
|
|
|
|
* 详情页面使用-转换数据
|
|
|
|
* 详情页面使用-转换数据
|
|
|
|
* @param id
|
|
|
|
*
|
|
|
|
* @return
|
|
|
|
* @param id
|
|
|
|
*/
|
|
|
|
* @return
|
|
|
|
|
|
|
|
*/
|
|
|
|
@Operation(summary = "表单信息(详情页)")
|
|
|
|
@Operation(summary = "表单信息(详情页)")
|
|
|
|
@GetMapping("/detail/{id}")
|
|
|
|
@GetMapping("/detail/{id}")
|
|
|
|
public ActionResult detailInfo(@PathVariable("id") String id){
|
|
|
|
public ActionResult detailInfo(@PathVariable("id") String id) {
|
|
|
|
StationAreaEntity entity= stationAreaService.getInfo(id);
|
|
|
|
StationAreaEntity entity = stationAreaService.getInfo(id);
|
|
|
|
if(entity==null){
|
|
|
|
if (entity == null) {
|
|
|
|
return ActionResult.fail("表单数据不存在!");
|
|
|
|
return ActionResult.fail("表单数据不存在!");
|
|
|
|
}
|
|
|
|
}
|
|
|
|
Map<String, Object> stationAreaMap=JsonUtil.entityToMap(entity);
|
|
|
|
Map<String, Object> stationAreaMap = JsonUtil.entityToMap(entity);
|
|
|
|
stationAreaMap.put("id", stationAreaMap.get("id"));
|
|
|
|
stationAreaMap.put("id", stationAreaMap.get("id"));
|
|
|
|
//副表数据
|
|
|
|
//副表数据
|
|
|
|
//子表数据
|
|
|
|
//子表数据
|
|
|
|
stationAreaMap = generaterSwapUtil.swapDataDetail(stationAreaMap,StationAreaConstant.getFormData(),"560427626187981125",false);
|
|
|
|
stationAreaMap = generaterSwapUtil.swapDataDetail(stationAreaMap, StationAreaConstant.getFormData(), "560427626187981125", false);
|
|
|
|
return ActionResult.success(stationAreaMap);
|
|
|
|
return ActionResult.success(stationAreaMap);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
/**
|
|
|
|
* 获取详情(编辑页)
|
|
|
|
* 获取详情(编辑页)
|
|
|
|
* 编辑页面使用-不转换数据
|
|
|
|
* 编辑页面使用-不转换数据
|
|
|
|
* @param id
|
|
|
|
*
|
|
|
|
* @return
|
|
|
|
* @param id
|
|
|
|
*/
|
|
|
|
* @return
|
|
|
|
|
|
|
|
*/
|
|
|
|
@Operation(summary = "信息")
|
|
|
|
@Operation(summary = "信息")
|
|
|
|
@GetMapping("/{id}")
|
|
|
|
@GetMapping("/{id}")
|
|
|
|
public ActionResult info(@PathVariable("id") String id){
|
|
|
|
public ActionResult info(@PathVariable("id") String id) {
|
|
|
|
StationAreaEntity entity= stationAreaService.getInfo(id);
|
|
|
|
StationAreaEntity entity = stationAreaService.getInfo(id);
|
|
|
|
if(entity==null){
|
|
|
|
if (entity == null) {
|
|
|
|
return ActionResult.fail("表单数据不存在!");
|
|
|
|
return ActionResult.fail("表单数据不存在!");
|
|
|
|
}
|
|
|
|
}
|
|
|
|
Map<String, Object> stationAreaMap=JsonUtil.entityToMap(entity);
|
|
|
|
Map<String, Object> stationAreaMap = JsonUtil.entityToMap(entity);
|
|
|
|
stationAreaMap.put("id", stationAreaMap.get("id"));
|
|
|
|
stationAreaMap.put("id", stationAreaMap.get("id"));
|
|
|
|
//副表数据
|
|
|
|
//副表数据
|
|
|
|
//子表数据
|
|
|
|
//子表数据
|
|
|
|
stationAreaMap = generaterSwapUtil.swapDataForm(stationAreaMap,StationAreaConstant.getFormData(),StationAreaConstant.TABLEFIELDKEY,StationAreaConstant.TABLERENAMES);
|
|
|
|
stationAreaMap = generaterSwapUtil.swapDataForm(stationAreaMap, StationAreaConstant.getFormData(), StationAreaConstant.TABLEFIELDKEY, StationAreaConstant.TABLERENAMES);
|
|
|
|
return ActionResult.success(stationAreaMap);
|
|
|
|
return ActionResult.success(stationAreaMap);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
//判断点所属区域
|
|
|
|
|
|
|
|
@Operation(summary = "判断当前位置所属区域")
|
|
|
|
|
|
|
|
@PostMapping("")
|
|
|
|
|
|
|
|
public ActionResult isInArea(@RequestBody Position position) {
|
|
|
|
|
|
|
|
//获取所有站点
|
|
|
|
|
|
|
|
List<StationAreaEntity> result = new ArrayList<>();
|
|
|
|
|
|
|
|
List<StationAreaEntity> list = stationAreaService.getTypeList(new StationAreaPagination(), "1");
|
|
|
|
|
|
|
|
BigDecimal lat = position.getLat();//纬度
|
|
|
|
|
|
|
|
BigDecimal lng = position.getLng();//经度
|
|
|
|
|
|
|
|
for (StationAreaEntity entity : list) {
|
|
|
|
|
|
|
|
String mapInfo = entity.getAreaMapInfo();
|
|
|
|
|
|
|
|
boolean in = AreaUtil.isInsidePolygon(mapInfo, lat, lng);
|
|
|
|
|
|
|
|
if (in) {
|
|
|
|
|
|
|
|
result.add(entity);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
if (result.size() > 0) {
|
|
|
|
|
|
|
|
return ActionResult.success(result);
|
|
|
|
|
|
|
|
} else return ActionResult.fail("当前所在位置不在任何区域中!");
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@Operation(summary = "获取该位置绑定的回收站列表")
|
|
|
|
|
|
|
|
@PostMapping("")
|
|
|
|
|
|
|
|
public ActionResult getBindStation(@RequestBody Position position) {
|
|
|
|
|
|
|
|
//获取
|
|
|
|
|
|
|
|
StationAreaEntity stationArea = null;
|
|
|
|
|
|
|
|
List<StationAreaEntity> list = stationAreaService.getTypeList(new StationAreaPagination(), "1");
|
|
|
|
|
|
|
|
BigDecimal lat = position.getLat();//纬度
|
|
|
|
|
|
|
|
BigDecimal lng = position.getLng();//经度
|
|
|
|
|
|
|
|
for (StationAreaEntity entity : list) {
|
|
|
|
|
|
|
|
String mapInfo = entity.getAreaMapInfo();
|
|
|
|
|
|
|
|
boolean in = AreaUtil.isInsidePolygon(mapInfo, lat, lng);
|
|
|
|
|
|
|
|
if (in) {
|
|
|
|
|
|
|
|
stationArea = entity;
|
|
|
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
if (stationArea != null) {
|
|
|
|
|
|
|
|
// todo 根据组织编号 获取回收站清单
|
|
|
|
|
|
|
|
return ActionResult.success(stationArea);
|
|
|
|
|
|
|
|
} else {
|
|
|
|
|
|
|
|
return ActionResult.fail("当前所在超出接单范围!");
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|