yunxi
/
ningxiaWeb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

电子围栏0523优化

Browse Source
master
guochaojie 5 months ago
parent fcaaaa6fce
commit 4ab0a6481a
3 changed files with 317 additions and 296 deletions
Show Stats Download Patch File Download Diff File

15
jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/StationAreaService.java
Unescape View File

@ -1,10 +1,11 @@
package jnpf.service;
import jnpf.model.stationarea.*;
import jnpf.entity.*;
import java.util.*;
import com.baomidou.mybatisplus.extension.service.IService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import jnpf.entity.StationAreaEntity;
import jnpf.model.stationarea.StationAreaForm;
import jnpf.model.stationarea.StationAreaPagination;
import java.util.List;
/**
* 商户经营区域
@ -16,7 +17,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
public interface StationAreaService extends IService<StationAreaEntity> {
List<StationAreaEntity> getList(StationAreaPagination stationAreaPagination);
List<StationAreaEntity> getTypeList(StationAreaPagination stationAreaPagination,String dataType);
List<StationAreaEntity> getTypeList(StationAreaPagination stationAreaPagination, String dataType);
StationAreaEntity getInfo(String id);
@ -28,9 +29,9 @@ public interface StationAreaService extends IService<StationAreaEntity> {
//子表方法
//副表数据方法
String checkForm(StationAreaForm form,int i);
String checkForm(StationAreaForm form, int i);
void saveOrUpdate(StationAreaForm stationAreaForm,String id, boolean isSave) throws Exception;
void saveOrUpdate(StationAreaForm stationAreaForm, String id, boolean isSave) throws Exception;
List<StationAreaEntity> getOthersArea(String id);
}

409
jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/StationAreaServiceImpl.java
Unescape View File

@ -1,37 +1,34 @@
package jnpf.service.impl;
import jnpf.entity.*;
import jnpf.mapper.StationAreaMapper;
import jnpf.service.*;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import jnpf.model.stationarea.*;
import java.math.BigDecimal;
import cn.hutool.core.util.ObjectUtil;
import jnpf.permission.model.authorize.AuthorizeConditionModel;
import jnpf.util.GeneraterSwapUtil;
import jnpf.database.model.superQuery.SuperQueryJsonModel;
import jnpf.database.model.superQuery.ConditionJsonModel;
import jnpf.database.model.superQuery.SuperQueryConditionModel;
import java.lang.reflect.Field;
import com.baomidou.mybatisplus.annotation.TableField;
import java.util.regex.Pattern;
import jnpf.model.QueryModel;
import java.util.stream.Collectors;
import jnpf.base.model.ColumnDataModel;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import jnpf.database.model.superQuery.SuperJsonModel;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import java.text.SimpleDateFormat;
import jnpf.util.*;
import java.util.*;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import jnpf.base.UserInfo;
import jnpf.base.model.ColumnDataModel;
import jnpf.database.model.superQuery.SuperJsonModel;
import jnpf.entity.StationAreaEntity;
import jnpf.mapper.StationAreaMapper;
import jnpf.model.QueryModel;
import jnpf.model.stationarea.StationAreaConstant;
import jnpf.model.stationarea.StationAreaForm;
import jnpf.model.stationarea.StationAreaPagination;
import jnpf.permission.entity.UserEntity;
import jnpf.service.StationAreaService;
import jnpf.util.*;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.lang.reflect.Field;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.stream.Collectors;
/**
*
* 商户经营区域
* 版本： V3.5
* 版权： 引迈信息技术有限公司（https://www.jnpfsoft.com）
@ -39,7 +36,7 @@ import jnpf.permission.entity.UserEntity;
* 日期： 2024-05-23
*/
@Service
public class StationAreaServiceImpl extends ServiceImpl<StationAreaMapper, StationAreaEntity> implements StationAreaService{
public class StationAreaServiceImpl extends ServiceImpl<StationAreaMapper, StationAreaEntity> implements StationAreaService {
@Autowired
private GeneraterSwapUtil generaterSwapUtil;
@ -47,300 +44,312 @@ public class StationAreaServiceImpl extends ServiceImpl<StationAreaMapper, Stati
private UserProvider userProvider;
@Override
public List<StationAreaEntity> getList(StationAreaPagination stationAreaPagination){
return getTypeList(stationAreaPagination,stationAreaPagination.getDataType());
public List<StationAreaEntity> getList(StationAreaPagination stationAreaPagination) {
return getTypeList(stationAreaPagination, stationAreaPagination.getDataType());
}
/** 列表查询 */
/**
* 列表查询
*/
@Override
public List<StationAreaEntity> getTypeList(StationAreaPagination stationAreaPagination,String dataType){
String userId=userProvider.get().getUserId();
List<String> AllIdList =new ArrayList();
List<List<String>> intersectionList =new ArrayList<>();
public List<StationAreaEntity> getTypeList(StationAreaPagination stationAreaPagination, String dataType) {
String userId = userProvider.get().getUserId();
List<String> AllIdList = new ArrayList();
List<List<String>> intersectionList = new ArrayList<>();
boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc");
String columnData = !isPc ? StationAreaConstant.getAppColumnData() : StationAreaConstant.getColumnData();
ColumnDataModel columnDataModel = JsonUtil.getJsonToBean(columnData, ColumnDataModel.class);
String ruleJson = !isPc ? JsonUtil.getObjectToString(columnDataModel.getRuleListApp()) : JsonUtil.getObjectToString(columnDataModel.getRuleList());
int total=0;
int stationAreaNum =0;
QueryWrapper<StationAreaEntity> stationAreaQueryWrapper=new QueryWrapper<>();
int total = 0;
int stationAreaNum = 0;
QueryWrapper<StationAreaEntity> stationAreaQueryWrapper = new QueryWrapper<>();
List<String> allSuperIDlist = new ArrayList<>();
String superOp ="";
if (ObjectUtil.isNotEmpty(stationAreaPagination.getSuperQueryJson())){
String superOp = "";
if (ObjectUtil.isNotEmpty(stationAreaPagination.getSuperQueryJson())) {
List<String> allSuperList = new ArrayList<>();
List<List<String>> intersectionSuperList = new ArrayList<>();
List<List<String>> intersectionSuperList = new ArrayList<>();
String queryJson = stationAreaPagination.getSuperQueryJson();
SuperJsonModel superJsonModel = JsonUtil.getJsonToBean(queryJson, SuperJsonModel.class);
int superNum = 0;
QueryWrapper<StationAreaEntity> stationAreaSuperWrapper = new QueryWrapper<>();
stationAreaSuperWrapper = generaterSwapUtil.getCondition(new QueryModel(stationAreaSuperWrapper,StationAreaEntity.class,queryJson,"0"));
stationAreaSuperWrapper = generaterSwapUtil.getCondition(new QueryModel(stationAreaSuperWrapper, StationAreaEntity.class, queryJson, "0"));
int stationAreaNum1 = stationAreaSuperWrapper.getExpression().getNormal().size();
if (stationAreaNum1>0){
List<String> stationAreaList =this.list(stationAreaSuperWrapper).stream().map(StationAreaEntity::getId).collect(Collectors.toList());
if (stationAreaNum1 > 0) {
List<String> stationAreaList = this.list(stationAreaSuperWrapper).stream().map(StationAreaEntity::getId).collect(Collectors.toList());
allSuperList.addAll(stationAreaList);
intersectionSuperList.add(stationAreaList);
superNum++;
}
superOp = superNum > 0 ? superJsonModel.getMatchLogic() : "";
//and or
if(superOp.equalsIgnoreCase("and")){
if (superOp.equalsIgnoreCase("and")) {
allSuperIDlist = generaterSwapUtil.getIntersection(intersectionSuperList);
}else{
} else {
allSuperIDlist = allSuperList;
}
}
List<String> allRuleIDlist = new ArrayList<>();
String ruleOp ="";
if (ObjectUtil.isNotEmpty(ruleJson)){
String ruleOp = "";
if (ObjectUtil.isNotEmpty(ruleJson)) {
List<String> allRuleList = new ArrayList<>();
List<List<String>> intersectionRuleList = new ArrayList<>();
List<List<String>> intersectionRuleList = new ArrayList<>();
SuperJsonModel ruleJsonModel = JsonUtil.getJsonToBean(ruleJson, SuperJsonModel.class);
int ruleNum = 0;
QueryWrapper<StationAreaEntity> stationAreaSuperWrapper = new QueryWrapper<>();
stationAreaSuperWrapper = generaterSwapUtil.getCondition(new QueryModel(stationAreaSuperWrapper,StationAreaEntity.class,ruleJson,"0"));
stationAreaSuperWrapper = generaterSwapUtil.getCondition(new QueryModel(stationAreaSuperWrapper, StationAreaEntity.class, ruleJson, "0"));
int stationAreaNum1 = stationAreaSuperWrapper.getExpression().getNormal().size();
if (stationAreaNum1>0){
List<String> stationAreaList =this.list(stationAreaSuperWrapper).stream().map(StationAreaEntity::getId).collect(Collectors.toList());
if (stationAreaNum1 > 0) {
List<String> stationAreaList = this.list(stationAreaSuperWrapper).stream().map(StationAreaEntity::getId).collect(Collectors.toList());
allRuleList.addAll(stationAreaList);
intersectionRuleList.add(stationAreaList);
ruleNum++;
}
ruleOp = ruleNum > 0 ? ruleJsonModel.getMatchLogic() : "";
//and or
if(ruleOp.equalsIgnoreCase("and")){
if (ruleOp.equalsIgnoreCase("and")) {
allRuleIDlist = generaterSwapUtil.getIntersection(intersectionRuleList);
}else{
} else {
allRuleIDlist = allRuleList;
}
}
boolean pcPermission = false;
boolean appPermission = false;
if(isPc && pcPermission){
if (!userProvider.get().getIsAdministrator()){
Object stationAreaObj=generaterSwapUtil.getAuthorizeCondition(new QueryModel(stationAreaQueryWrapper,StationAreaEntity.class,stationAreaPagination.getMenuId(),"0"));
if (ObjectUtil.isEmpty(stationAreaObj)){
return new ArrayList<>();
} else {
stationAreaQueryWrapper = (QueryWrapper<StationAreaEntity>)stationAreaObj;
if( stationAreaQueryWrapper.getExpression().getNormal().size()>0){
stationAreaNum++;
}
}
}
}
if(!isPc && appPermission){
if (!userProvider.get().getIsAdministrator()){
Object stationAreaObj=generaterSwapUtil.getAuthorizeCondition(new QueryModel(stationAreaQueryWrapper,StationAreaEntity.class,stationAreaPagination.getMenuId(),"0"));
if (ObjectUtil.isEmpty(stationAreaObj)){
return new ArrayList<>();
} else {
stationAreaQueryWrapper = (QueryWrapper<StationAreaEntity>)stationAreaObj;
if( stationAreaQueryWrapper.getExpression().getNormal().size()>0){
stationAreaNum++;
}
boolean pcPermission = false;
boolean appPermission = false;
if (isPc && pcPermission) {
if (!userProvider.get().getIsAdministrator()) {
Object stationAreaObj = generaterSwapUtil.getAuthorizeCondition(new QueryModel(stationAreaQueryWrapper, StationAreaEntity.class, stationAreaPagination.getMenuId(), "0"));
if (ObjectUtil.isEmpty(stationAreaObj)) {
return new ArrayList<>();
} else {
stationAreaQueryWrapper = (QueryWrapper<StationAreaEntity>) stationAreaObj;
if (stationAreaQueryWrapper.getExpression().getNormal().size() > 0) {
stationAreaNum++;
}
}
}
}
if (!isPc && appPermission) {
if (!userProvider.get().getIsAdministrator()) {
Object stationAreaObj = generaterSwapUtil.getAuthorizeCondition(new QueryModel(stationAreaQueryWrapper, StationAreaEntity.class, stationAreaPagination.getMenuId(), "0"));
if (ObjectUtil.isEmpty(stationAreaObj)) {
return new ArrayList<>();
} else {
stationAreaQueryWrapper = (QueryWrapper<StationAreaEntity>) stationAreaObj;
if (stationAreaQueryWrapper.getExpression().getNormal().size() > 0) {
stationAreaNum++;
}
}
}
}
if(isPc){
if(ObjectUtil.isNotEmpty(stationAreaPagination.getAreaName())){
stationAreaNum++;
}
}
if (isPc) {
if (ObjectUtil.isNotEmpty(stationAreaPagination.getAreaName())) {
stationAreaNum++;
String value = stationAreaPagination.getAreaName() instanceof List ?
JsonUtil.getObjectToString(stationAreaPagination.getAreaName()) :
String.valueOf(stationAreaPagination.getAreaName());
stationAreaQueryWrapper.lambda().like(StationAreaEntity::getAreaName,value);
JsonUtil.getObjectToString(stationAreaPagination.getAreaName()) :
String.valueOf(stationAreaPagination.getAreaName());
stationAreaQueryWrapper.lambda().like(StationAreaEntity::getAreaName, value);
}
if(ObjectUtil.isNotEmpty(stationAreaPagination.getAreaType())){
stationAreaNum++;
if (ObjectUtil.isNotEmpty(stationAreaPagination.getAreaType())) {
stationAreaNum++;
List<String> idList = new ArrayList<>();
try {
String[][] areaType = JsonUtil.getJsonToBean(stationAreaPagination.getAreaType(),String[][].class);
for(int i=0;i<areaType.length;i++){
if(areaType[i].length>0){
idList.add(JsonUtil.getObjectToString(Arrays.asList(areaType[i])));
}
}
}catch (Exception e1){
try {
List<String> areaType = JsonUtil.getJsonToList(stationAreaPagination.getAreaType(),String.class);
if(areaType.size()>0){
idList.addAll(areaType);
}
}catch (Exception e2){
idList.add(String.valueOf(stationAreaPagination.getAreaType()));
}
}
stationAreaQueryWrapper.lambda().and(t->{
idList.forEach(tt->{
t.like(StationAreaEntity::getAreaType, tt).or();
});
});
List<String> idList = new ArrayList<>();
try {
String[][] areaType = JsonUtil.getJsonToBean(stationAreaPagination.getAreaType(), String[][].class);
for (int i = 0; i < areaType.length; i++) {
if (areaType[i].length > 0) {
idList.add(JsonUtil.getObjectToString(Arrays.asList(areaType[i])));
}
}
} catch (Exception e1) {
try {
List<String> areaType = JsonUtil.getJsonToList(stationAreaPagination.getAreaType(), String.class);
if (areaType.size() > 0) {
idList.addAll(areaType);
}
} catch (Exception e2) {
idList.add(String.valueOf(stationAreaPagination.getAreaType()));
}
}
stationAreaQueryWrapper.lambda().and(t -> {
idList.forEach(tt -> {
t.like(StationAreaEntity::getAreaType, tt).or();
});
});
}
if(ObjectUtil.isNotEmpty(stationAreaPagination.getStatus())){
stationAreaNum++;
if (ObjectUtil.isNotEmpty(stationAreaPagination.getStatus())) {
stationAreaNum++;
stationAreaQueryWrapper.lambda().eq(StationAreaEntity::getStatus,stationAreaPagination.getStatus());
stationAreaQueryWrapper.lambda().eq(StationAreaEntity::getStatus, stationAreaPagination.getStatus());
}
if(ObjectUtil.isNotEmpty(stationAreaPagination.getCompanyId())){
stationAreaNum++;
if (ObjectUtil.isNotEmpty(stationAreaPagination.getCompanyId())) {
stationAreaNum++;
List<String> idList = new ArrayList<>();
try {
String[][] companyId = JsonUtil.getJsonToBean(stationAreaPagination.getCompanyId(),String[][].class);
for(int i=0;i<companyId.length;i++){
if(companyId[i].length>0){
idList.add(JsonUtil.getObjectToString(Arrays.asList(companyId[i])));
}
}
}catch (Exception e1){
try {
List<String> companyId = JsonUtil.getJsonToList(stationAreaPagination.getCompanyId(),String.class);
if(companyId.size()>0){
idList.add(JsonUtil.getObjectToString(companyId));
}
}catch (Exception e2){
idList.add(String.valueOf(stationAreaPagination.getCompanyId()));
}
}
stationAreaQueryWrapper.lambda().and(t->{
idList.forEach(tt->{
t.like(StationAreaEntity::getCompanyId, tt).or();
});
});
List<String> idList = new ArrayList<>();
try {
String[][] companyId = JsonUtil.getJsonToBean(stationAreaPagination.getCompanyId(), String[][].class);
for (int i = 0; i < companyId.length; i++) {
if (companyId[i].length > 0) {
idList.add(JsonUtil.getObjectToString(Arrays.asList(companyId[i])));
}
}
} catch (Exception e1) {
try {
List<String> companyId = JsonUtil.getJsonToList(stationAreaPagination.getCompanyId(), String.class);
if (companyId.size() > 0) {
idList.add(JsonUtil.getObjectToString(companyId));
}
} catch (Exception e2) {
idList.add(String.valueOf(stationAreaPagination.getCompanyId()));
}
}
stationAreaQueryWrapper.lambda().and(t -> {
idList.forEach(tt -> {
t.like(StationAreaEntity::getCompanyId, tt).or();
});
});
}
}
List<String> intersection = generaterSwapUtil.getIntersection(intersectionList);
if (total>0){
if (intersection.size()==0){
if (total > 0) {
if (intersection.size() == 0) {
intersection.add("jnpfNullList");
}
stationAreaQueryWrapper.lambda().in(StationAreaEntity::getId, intersection);
}
//是否有高级查询
if (StringUtil.isNotEmpty(superOp)){
if (allSuperIDlist.size()==0){
//是否有高级查询
if (StringUtil.isNotEmpty(superOp)) {
if (allSuperIDlist.size() == 0) {
allSuperIDlist.add("jnpfNullList");
}
List<String> finalAllSuperIDlist = allSuperIDlist;
stationAreaQueryWrapper.lambda().and(t->t.in(StationAreaEntity::getId, finalAllSuperIDlist));
stationAreaQueryWrapper.lambda().and(t -> t.in(StationAreaEntity::getId, finalAllSuperIDlist));
}
//是否有数据过滤查询
if (StringUtil.isNotEmpty(ruleOp)){
if (allRuleIDlist.size()==0){
//是否有数据过滤查询
if (StringUtil.isNotEmpty(ruleOp)) {
if (allRuleIDlist.size() == 0) {
allRuleIDlist.add("jnpfNullList");
}
List<String> finalAllRuleIDlist = allRuleIDlist;
stationAreaQueryWrapper.lambda().and(t->t.in(StationAreaEntity::getId, finalAllRuleIDlist));
stationAreaQueryWrapper.lambda().and(t -> t.in(StationAreaEntity::getId, finalAllRuleIDlist));
}
//排序
if(StringUtil.isEmpty(stationAreaPagination.getSidx())){
if (StringUtil.isEmpty(stationAreaPagination.getSidx())) {
stationAreaQueryWrapper.lambda().orderByDesc(StationAreaEntity::getId);
}else{
} else {
try {
String sidx = stationAreaPagination.getSidx();
String[] strs= sidx.split("_name");
String[] strs = sidx.split("_name");
StationAreaEntity stationAreaEntity = new StationAreaEntity();
Field declaredField = stationAreaEntity.getClass().getDeclaredField(strs[0]);
declaredField.setAccessible(true);
String value = declaredField.getAnnotation(TableField.class).value();
stationAreaQueryWrapper="asc".equals(stationAreaPagination.getSort().toLowerCase())?stationAreaQueryWrapper.orderByAsc(value):stationAreaQueryWrapper.orderByDesc(value);
stationAreaQueryWrapper = "asc".equals(stationAreaPagination.getSort().toLowerCase()) ? stationAreaQueryWrapper.orderByAsc(value) : stationAreaQueryWrapper.orderByDesc(value);
} catch (NoSuchFieldException e) {
e.printStackTrace();
}
}
if("0".equals(dataType)){
if((total>0 && AllIdList.size()>0) || total==0){
Page<StationAreaEntity> page=new Page<>(stationAreaPagination.getCurrentPage(), stationAreaPagination.getPageSize());
IPage<StationAreaEntity> userIPage=this.page(page, stationAreaQueryWrapper);
return stationAreaPagination.setData(userIPage.getRecords(),userIPage.getTotal());
}else{
if ("0".equals(dataType)) {
if ((total > 0 && AllIdList.size() > 0) || total == 0) {
Page<StationAreaEntity> page = new Page<>(stationAreaPagination.getCurrentPage(), stationAreaPagination.getPageSize());
IPage<StationAreaEntity> userIPage = this.page(page, stationAreaQueryWrapper);
return stationAreaPagination.setData(userIPage.getRecords(), userIPage.getTotal());
} else {
List<StationAreaEntity> list = new ArrayList();
return stationAreaPagination.setData(list, list.size());
}
}else{
} else {
return this.list(stationAreaQueryWrapper);
}
}
@Override
public StationAreaEntity getInfo(String id){
QueryWrapper<StationAreaEntity> queryWrapper=new QueryWrapper<>();
queryWrapper.lambda().eq(StationAreaEntity::getId,id);
public StationAreaEntity getInfo(String id) {
QueryWrapper<StationAreaEntity> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().eq(StationAreaEntity::getId, id);
return this.getOne(queryWrapper);
}
@Override
public void create(StationAreaEntity entity){
public void create(StationAreaEntity entity) {
this.save(entity);
}
@Override
public boolean update(String id, StationAreaEntity entity){
public boolean update(String id, StationAreaEntity entity) {
return this.updateById(entity);
}
@Override
public void delete(StationAreaEntity entity){
if(entity!=null){
public void delete(StationAreaEntity entity) {
if (entity != null) {
this.removeById(entity.getId());
}
}
/** 验证表单唯一字段，正则，非空 i-0新增-1修改*/
/**
* 验证表单唯一字段，正则，非空 i-0新增-1修改
*/
@Override
public String checkForm(StationAreaForm form,int i) {
boolean isUp =StringUtil.isNotEmpty(form.getId()) && !form.getId().equals("0");
String id="";
public String checkForm(StationAreaForm form, int i) {
boolean isUp = StringUtil.isNotEmpty(form.getId()) && !form.getId().equals("0");
String id = "";
String countRecover = "";
if (isUp){
if (isUp) {
id = form.getId();
}
//主表字段验证
if(StringUtil.isEmpty(form.getAreaName())){
return "区域名称不能为空";
}
if(StringUtil.isEmpty(form.getAreaMapInfo())){
return "地图信息不能为空";
}
if (StringUtil.isEmpty(form.getAreaName())) {
return "区域名称不能为空";
}
if (StringUtil.isEmpty(form.getAreaMapInfo())) {
return "地图信息不能为空";
}
return countRecover;
}
/**
* 新增修改数据(事务回滚)
* @param id
* @param stationAreaForm
* @return
*/
* 新增修改数据(事务回滚)
*
* @param id
* @param stationAreaForm
* @return
*/
@Override
@Transactional
public void saveOrUpdate(StationAreaForm stationAreaForm,String id, boolean isSave) throws Exception{
UserInfo userInfo=userProvider.get();
public void saveOrUpdate(StationAreaForm stationAreaForm, String id, boolean isSave) throws Exception {
UserInfo userInfo = userProvider.get();
UserEntity userEntity = generaterSwapUtil.getUser(userInfo.getUserId());
stationAreaForm = JsonUtil.getJsonToBean(
generaterSwapUtil.swapDatetime(StationAreaConstant.getFormData(),stationAreaForm),StationAreaForm.class);
generaterSwapUtil.swapDatetime(StationAreaConstant.getFormData(), stationAreaForm), StationAreaForm.class);
StationAreaEntity entity = JsonUtil.getJsonToBean(stationAreaForm, StationAreaEntity.class);
if(isSave){
String mainId = RandomUtil.uuId() ;
entity.setCreatorUserId(userInfo.getUserId());
entity.setCreatorTime(DateUtil.getNowDate());
entity.setOrganizeJsonId(generaterSwapUtil.getCurrentOrgIds(userInfo.getOrganizeId(),"all"));
entity.setLastModifyUserId(null);
entity.setLastModifyTime(null);
if (isSave) {
String mainId = RandomUtil.uuId();
entity.setCreatorUserId(userInfo.getUserId());
entity.setCreatorTime(DateUtil.getNowDate());
entity.setOrganizeJsonId(generaterSwapUtil.getCurrentOrgIds(userInfo.getOrganizeId(), "all"));
entity.setLastModifyUserId(null);
entity.setLastModifyTime(null);
entity.setId(mainId);
}else{
entity.setCreatorUserId(userInfo.getUserId());
entity.setCreatorTime(DateUtil.getNowDate());
entity.setOrganizeJsonId(generaterSwapUtil.getCurrentOrgIds(userInfo.getOrganizeId(),"all"));
entity.setLastModifyUserId(null);
entity.setLastModifyTime(null);
} else {
entity.setCreatorUserId(userInfo.getUserId());
entity.setCreatorTime(DateUtil.getNowDate());
entity.setOrganizeJsonId(generaterSwapUtil.getCurrentOrgIds(userInfo.getOrganizeId(), "all"));
entity.setLastModifyUserId(null);
entity.setLastModifyTime(null);
}
this.saveOrUpdate(entity);
@ -349,7 +358,9 @@ public class StationAreaServiceImpl extends ServiceImpl<StationAreaMapper, Stati
@Override
public List<StationAreaEntity> getOthersArea(String id) {
QueryWrapper<StationAreaEntity> wrapper = new QueryWrapper<>();
wrapper.ne("id", id);
if (StringUtil.isNotEmpty(id)) {
wrapper.ne("id", id);
}
List<StationAreaEntity> list = this.list(wrapper);
return list;
}

189
jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/StationAreaController.java
Unescape View File

@ -1,38 +1,38 @@
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.tags.Tag;
import jnpf.base.ActionResult;
import jnpf.base.UserInfo;
import jnpf.exception.DataException;
import jnpf.permission.entity.UserEntity;
import jnpf.service.*;
import jnpf.entity.*;
import jnpf.util.*;
import jnpf.model.stationarea.*;
import jnpf.base.vo.PageListVO;
import jnpf.base.vo.PaginationVO;
import jnpf.entity.EnterpriserecyclestationEntity;
import jnpf.entity.StationAreaEntity;
import jnpf.model.stationarea.Position;
import jnpf.model.stationarea.StationAreaConstant;
import jnpf.model.stationarea.StationAreaForm;
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 org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
import javax.validation.Valid;
import java.math.BigDecimal;
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.util.stream.Collectors;
import jnpf.engine.entity.FlowTaskEntity;
import jnpf.exception.WorkFlowException;
import org.springframework.transaction.annotation.Transactional;
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
/**
* 商户经营区域
*
* @版本： V3.5
* @版权： 引迈信息技术有限公司（https://www.jnpfsoft.com）
* @作者： JNPF开发平台组
@ -40,7 +40,7 @@ import org.springframework.transaction.annotation.Transactional;
*/
@Slf4j
@RestController
@Tag(name = "商户经营区域" , description = "scm")
@Tag(name = "商户经营区域", description = "scm")
@RequestMapping("/api/scm/StationArea")
public class StationAreaController {
@ -58,25 +58,25 @@ public class StationAreaController {
/**
* 列表
*
* @param stationAreaPagination
* @return
*/
* 列表
*
* @param stationAreaPagination
* @return
*/
@Operation(summary = "获取列表")
@PostMapping("/getList")
public ActionResult list(@RequestBody StationAreaPagination stationAreaPagination)throws IOException{
List<StationAreaEntity> list= stationAreaService.getList(stationAreaPagination);
List<Map<String, Object>> realList=new ArrayList<>();
public ActionResult list(@RequestBody StationAreaPagination stationAreaPagination) throws IOException {
List<StationAreaEntity> list = stationAreaService.getList(stationAreaPagination);
List<Map<String, Object>> realList = new ArrayList<>();
for (StationAreaEntity entity : list) {
Map<String, Object> stationAreaMap=JsonUtil.entityToMap(entity);
stationAreaMap.put("id", stationAreaMap.get("id"));
//副表数据
//子表数据
Map<String, Object> stationAreaMap = JsonUtil.entityToMap(entity);
stationAreaMap.put("id", stationAreaMap.get("id"));
//副表数据
//子表数据
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();
@ -85,109 +85,118 @@ public class StationAreaController {
vo.setPagination(page);
return ActionResult.success(vo);
}
/**
* 创建
*
* @param stationAreaForm
* @return
*/
* 创建
*
* @param stationAreaForm
* @return
*/
@PostMapping()
@Operation(summary = "创建")
public ActionResult create(@RequestBody @Valid StationAreaForm stationAreaForm) {
String b = stationAreaService.checkForm(stationAreaForm,0);
if (StringUtil.isNotEmpty(b)){
return ActionResult.fail(b );
String b = stationAreaService.checkForm(stationAreaForm, 0);
if (StringUtil.isNotEmpty(b)) {
return ActionResult.fail(b);
}
try{
stationAreaService.saveOrUpdate(stationAreaForm, null ,true);
}catch(Exception e){
try {
stationAreaService.saveOrUpdate(stationAreaForm, null, true);
} catch (Exception e) {
return ActionResult.fail("新增数据失败");
}
return ActionResult.success("创建成功");
}
/**
* 编辑
* @param id
* @param stationAreaForm
* @return
*/
* 编辑
*
* @param id
* @param stationAreaForm
* @return
*/
@PutMapping("/{id}")
@Operation(summary = "更新")
public ActionResult update(@PathVariable("id") String id,@RequestBody @Valid StationAreaForm stationAreaForm,
@RequestParam(value = "isImport", required = false) boolean isImport){
public ActionResult update(@PathVariable("id") String id, @RequestBody @Valid StationAreaForm stationAreaForm,
@RequestParam(value = "isImport", required = false) boolean isImport) {
stationAreaForm.setId(id);
if (!isImport) {
String b = stationAreaService.checkForm(stationAreaForm,1);
if (StringUtil.isNotEmpty(b)){
return ActionResult.fail(b );
String b = stationAreaService.checkForm(stationAreaForm, 1);
if (StringUtil.isNotEmpty(b)) {
return ActionResult.fail(b);
}
}
StationAreaEntity entity= stationAreaService.getInfo(id);
if(entity!=null){
try{
stationAreaService.saveOrUpdate(stationAreaForm,id,false);
}catch(Exception e){
StationAreaEntity entity = stationAreaService.getInfo(id);
if (entity != null) {
try {
stationAreaService.saveOrUpdate(stationAreaForm, id, false);
} catch (Exception e) {
return ActionResult.fail("修改数据失败");
}
return ActionResult.success("更新成功");
}else{
} else {
return ActionResult.fail("更新失败，数据不存在");
}
}
/**
* 删除
* @param id
* @return
*/
* 删除
*
* @param id
* @return
*/
@Operation(summary = "删除")
@DeleteMapping("/{id}")
@Transactional
public ActionResult delete(@PathVariable("id") String id){
StationAreaEntity entity= stationAreaService.getInfo(id);
if(entity!=null){
public ActionResult delete(@PathVariable("id") String id) {
StationAreaEntity entity = stationAreaService.getInfo(id);
if (entity != null) {
//主表数据删除
stationAreaService.delete(entity);
}
return ActionResult.success("删除成功");
}
/**
* 表单信息(详情页)
* 详情页面使用-转换数据
* @param id
* @return
*/
* 表单信息(详情页)
* 详情页面使用-转换数据
*
* @param id
* @return
*/
@Operation(summary = "表单信息(详情页)")
@GetMapping("/detail/{id}")
public ActionResult detailInfo(@PathVariable("id") String id){
StationAreaEntity entity= stationAreaService.getInfo(id);
if(entity==null){
public ActionResult detailInfo(@PathVariable("id") String id) {
StationAreaEntity entity = stationAreaService.getInfo(id);
if (entity == null) {
return ActionResult.fail("表单数据不存在！");
}
Map<String, Object> stationAreaMap=JsonUtil.entityToMap(entity);
Map<String, Object> stationAreaMap = JsonUtil.entityToMap(entity);
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);
}
/**
* 获取详情(编辑页)
* 编辑页面使用-不转换数据
* @param id
* @return
*/
* 获取详情(编辑页)
* 编辑页面使用-不转换数据
*
* @param id
* @return
*/
@Operation(summary = "信息")
@GetMapping("/{id}")
public ActionResult info(@PathVariable("id") String id){
StationAreaEntity entity= stationAreaService.getInfo(id);
if(entity==null){
public ActionResult info(@PathVariable("id") String id) {
StationAreaEntity entity = stationAreaService.getInfo(id);
if (entity == null) {
return ActionResult.fail("表单数据不存在！");
}
Map<String, Object> stationAreaMap=JsonUtil.entityToMap(entity);
Map<String, Object> stationAreaMap = JsonUtil.entityToMap(entity);
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);
}
@ -239,7 +248,7 @@ public class StationAreaController {
@PostMapping("/getOthersArea/{id}")
@Operation(summary = "获取非当前编辑的其他区域信息")
public ActionResult getOthersArea(@PathVariable String id) {
public ActionResult getOthersArea(@PathVariable(name = "id",required = false,value = "") String id) {
List<StationAreaEntity> othersArea = stationAreaService.getOthersArea(id);
return ActionResult.success(othersArea);
}

Write Preview
Loading…
Cancel
Save