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

map

Browse Source
master
jevononlie 5 months ago
parent 6e6044933c 028da7c7a5
commit 141d7b92e5
12 changed files with 490 additions and 447 deletions
Show Stats Download Patch File Download Diff File

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

@ -1,22 +1,23 @@
package jnpf.service; package jnpf.service;
import jnpf.model.stationarea.*;
import jnpf.entity.*;
import java.util.*;
import com.baomidou.mybatisplus.extension.service.IService; 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;
/** /**
* 商户经营区域 * 商户经营区域
* 版本： V3.5 * 版本： V3.5
* 版权： 引迈信息技术有限公司（https://www.jnpfsoft.com） * 版权： 引迈信息技术有限公司（https://www.jnpfsoft.com）
* 作者： JNPF开发平台组 * 作者： JNPF开发平台组
* 日期： 2024-05-21 * 日期： 2024-05-23
*/ */
public interface StationAreaService extends IService<StationAreaEntity> { public interface StationAreaService extends IService<StationAreaEntity> {
List<StationAreaEntity> getList(StationAreaPagination stationAreaPagination); List<StationAreaEntity> getList(StationAreaPagination stationAreaPagination);
List<StationAreaEntity> getTypeList(StationAreaPagination stationAreaPagination,String dataType); List<StationAreaEntity> getTypeList(StationAreaPagination stationAreaPagination, String dataType);
StationAreaEntity getInfo(String id); StationAreaEntity getInfo(String id);
@ -28,8 +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);
} }

454
jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/EnterpriserecyclestationServiceImpl.java
Unescape View File

@ -5,18 +5,26 @@ import jnpf.mapper.EnterpriserecyclestationMapper;
import jnpf.service.*; import jnpf.service.*;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import jnpf.model.enterpriserecyclestation.*; import jnpf.model.enterpriserecyclestation.*;
import java.math.BigDecimal; import java.math.BigDecimal;
import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.ObjectUtil;
import jnpf.permission.model.authorize.AuthorizeConditionModel; import jnpf.permission.model.authorize.AuthorizeConditionModel;
import jnpf.util.GeneraterSwapUtil; import jnpf.util.GeneraterSwapUtil;
import jnpf.database.model.superQuery.SuperQueryJsonModel; import jnpf.database.model.superQuery.SuperQueryJsonModel;
import jnpf.database.model.superQuery.ConditionJsonModel; import jnpf.database.model.superQuery.ConditionJsonModel;
import jnpf.database.model.superQuery.SuperQueryConditionModel; import jnpf.database.model.superQuery.SuperQueryConditionModel;
import java.lang.reflect.Field; import java.lang.reflect.Field;
import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField;
import java.util.regex.Pattern; import java.util.regex.Pattern;
import jnpf.model.QueryModel; import jnpf.model.QueryModel;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import jnpf.base.model.ColumnDataModel; import jnpf.base.model.ColumnDataModel;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
@ -25,13 +33,17 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import jnpf.util.*; import jnpf.util.*;
import java.util.*; import java.util.*;
import jnpf.base.UserInfo; import jnpf.base.UserInfo;
import jnpf.permission.entity.UserEntity; import jnpf.permission.entity.UserEntity;
/** /**
*
* Enterpriserecyclestation * Enterpriserecyclestation
* 版本： V3.5 * 版本： V3.5
* 版权： 引迈信息技术有限公司（https://www.jnpfsoft.com） * 版权： 引迈信息技术有限公司（https://www.jnpfsoft.com）
@ -39,7 +51,7 @@ import jnpf.permission.entity.UserEntity;
* 日期： 2024-01-29 * 日期： 2024-01-29
*/ */
@Service @Service
public class EnterpriserecyclestationServiceImpl extends ServiceImpl<EnterpriserecyclestationMapper, EnterpriserecyclestationEntity> implements EnterpriserecyclestationService{ public class EnterpriserecyclestationServiceImpl extends ServiceImpl<EnterpriserecyclestationMapper, EnterpriserecyclestationEntity> implements EnterpriserecyclestationService {
@Autowired @Autowired
private GeneraterSwapUtil generaterSwapUtil; private GeneraterSwapUtil generaterSwapUtil;
@ -52,174 +64,178 @@ public class EnterpriserecyclestationServiceImpl extends ServiceImpl<Enterpriser
private RecyclestationhousingestateService recyclestationhousingestateService; private RecyclestationhousingestateService recyclestationhousingestateService;
@Autowired @Autowired
private HousingEstateService housingEstateService; private HousingEstateService housingEstateService;
@Override @Override
public List<EnterpriserecyclestationEntity> getList(EnterpriserecyclestationPagination enterpriserecyclestationPagination){ public List<EnterpriserecyclestationEntity> getList(EnterpriserecyclestationPagination enterpriserecyclestationPagination) {
return getTypeList(enterpriserecyclestationPagination,enterpriserecyclestationPagination.getDataType()); return getTypeList(enterpriserecyclestationPagination, enterpriserecyclestationPagination.getDataType());
} }
/** 列表查询 */
/**
* 列表查询
*/
@Override @Override
public List<EnterpriserecyclestationEntity> getTypeList(EnterpriserecyclestationPagination enterpriserecyclestationPagination,String dataType){ public List<EnterpriserecyclestationEntity> getTypeList(EnterpriserecyclestationPagination enterpriserecyclestationPagination, String dataType) {
String userId=userProvider.get().getUserId(); String userId = userProvider.get().getUserId();
List<String> AllIdList =new ArrayList(); List<String> AllIdList = new ArrayList();
List<List<String>> intersectionList =new ArrayList<>(); List<List<String>> intersectionList = new ArrayList<>();
boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc"); boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc");
String columnData = !isPc ? EnterpriserecyclestationConstant.getAppColumnData() : EnterpriserecyclestationConstant.getColumnData(); String columnData = !isPc ? EnterpriserecyclestationConstant.getAppColumnData() : EnterpriserecyclestationConstant.getColumnData();
ColumnDataModel columnDataModel = JsonUtil.getJsonToBean(columnData, ColumnDataModel.class); ColumnDataModel columnDataModel = JsonUtil.getJsonToBean(columnData, ColumnDataModel.class);
String ruleJson = !isPc ? JsonUtil.getObjectToString(columnDataModel.getRuleListApp()) : JsonUtil.getObjectToString(columnDataModel.getRuleList()); String ruleJson = !isPc ? JsonUtil.getObjectToString(columnDataModel.getRuleListApp()) : JsonUtil.getObjectToString(columnDataModel.getRuleList());
int total=0; int total = 0;
int enterpriserecyclestationNum =0; int enterpriserecyclestationNum = 0;
QueryWrapper<EnterpriserecyclestationEntity> enterpriserecyclestationQueryWrapper=new QueryWrapper<>(); QueryWrapper<EnterpriserecyclestationEntity> enterpriserecyclestationQueryWrapper = new QueryWrapper<>();
int recyclestationhousingestateNum =0; int recyclestationhousingestateNum = 0;
QueryWrapper<RecyclestationhousingestateEntity> recyclestationhousingestateQueryWrapper=new QueryWrapper<>(); QueryWrapper<RecyclestationhousingestateEntity> recyclestationhousingestateQueryWrapper = new QueryWrapper<>();
int recyclestationpriceNum =0; int recyclestationpriceNum = 0;
QueryWrapper<RecyclestationpriceEntity> recyclestationpriceQueryWrapper=new QueryWrapper<>(); QueryWrapper<RecyclestationpriceEntity> recyclestationpriceQueryWrapper = new QueryWrapper<>();
long recyclestationhousingestatecount = recyclestationhousingestateService.count(); long recyclestationhousingestatecount = recyclestationhousingestateService.count();
long recyclestationpricecount = recyclestationpriceService.count(); long recyclestationpricecount = recyclestationpriceService.count();
List<String> allSuperIDlist = new ArrayList<>(); List<String> allSuperIDlist = new ArrayList<>();
String superOp =""; String superOp = "";
if (ObjectUtil.isNotEmpty(enterpriserecyclestationPagination.getSuperQueryJson())){ if (ObjectUtil.isNotEmpty(enterpriserecyclestationPagination.getSuperQueryJson())) {
List<String> allSuperList = new ArrayList<>(); List<String> allSuperList = new ArrayList<>();
List<List<String>> intersectionSuperList = new ArrayList<>(); List<List<String>> intersectionSuperList = new ArrayList<>();
String queryJson = enterpriserecyclestationPagination.getSuperQueryJson(); String queryJson = enterpriserecyclestationPagination.getSuperQueryJson();
SuperJsonModel superJsonModel = JsonUtil.getJsonToBean(queryJson, SuperJsonModel.class); SuperJsonModel superJsonModel = JsonUtil.getJsonToBean(queryJson, SuperJsonModel.class);
int superNum = 0; int superNum = 0;
QueryWrapper<EnterpriserecyclestationEntity> enterpriserecyclestationSuperWrapper = new QueryWrapper<>(); QueryWrapper<EnterpriserecyclestationEntity> enterpriserecyclestationSuperWrapper = new QueryWrapper<>();
enterpriserecyclestationSuperWrapper = generaterSwapUtil.getCondition(new QueryModel(enterpriserecyclestationSuperWrapper,EnterpriserecyclestationEntity.class,queryJson,"0")); enterpriserecyclestationSuperWrapper = generaterSwapUtil.getCondition(new QueryModel(enterpriserecyclestationSuperWrapper, EnterpriserecyclestationEntity.class, queryJson, "0"));
int enterpriserecyclestationNum1 = enterpriserecyclestationSuperWrapper.getExpression().getNormal().size(); int enterpriserecyclestationNum1 = enterpriserecyclestationSuperWrapper.getExpression().getNormal().size();
if (enterpriserecyclestationNum1>0){ if (enterpriserecyclestationNum1 > 0) {
List<String> enterpriserecyclestationList =this.list(enterpriserecyclestationSuperWrapper).stream().map(EnterpriserecyclestationEntity::getId).collect(Collectors.toList()); List<String> enterpriserecyclestationList = this.list(enterpriserecyclestationSuperWrapper).stream().map(EnterpriserecyclestationEntity::getId).collect(Collectors.toList());
allSuperList.addAll(enterpriserecyclestationList); allSuperList.addAll(enterpriserecyclestationList);
intersectionSuperList.add(enterpriserecyclestationList); intersectionSuperList.add(enterpriserecyclestationList);
superNum++; superNum++;
} }
String RecyclestationhousingestateTable = "nx_recycle_station_housing_estate"; String RecyclestationhousingestateTable = "nx_recycle_station_housing_estate";
boolean RecyclestationhousingestateHasSql = queryJson.contains(RecyclestationhousingestateTable); boolean RecyclestationhousingestateHasSql = queryJson.contains(RecyclestationhousingestateTable);
List<String> recyclestationhousingestateList = generaterSwapUtil.selectIdsByChildCondition(EnterpriserecyclestationConstant.getTableList(), RecyclestationhousingestateTable , queryJson, null); List<String> recyclestationhousingestateList = generaterSwapUtil.selectIdsByChildCondition(EnterpriserecyclestationConstant.getTableList(), RecyclestationhousingestateTable, queryJson, null);
if (RecyclestationhousingestateHasSql){ if (RecyclestationhousingestateHasSql) {
allSuperList.addAll(recyclestationhousingestateList); allSuperList.addAll(recyclestationhousingestateList);
intersectionSuperList.add(recyclestationhousingestateList); intersectionSuperList.add(recyclestationhousingestateList);
superNum++; superNum++;
} }
String RecyclestationpriceTable = "nx_recycle_station_price"; String RecyclestationpriceTable = "nx_recycle_station_price";
boolean RecyclestationpriceHasSql = queryJson.contains(RecyclestationpriceTable); boolean RecyclestationpriceHasSql = queryJson.contains(RecyclestationpriceTable);
List<String> recyclestationpriceList = generaterSwapUtil.selectIdsByChildCondition(EnterpriserecyclestationConstant.getTableList(), RecyclestationpriceTable , queryJson, null); List<String> recyclestationpriceList = generaterSwapUtil.selectIdsByChildCondition(EnterpriserecyclestationConstant.getTableList(), RecyclestationpriceTable, queryJson, null);
if (RecyclestationpriceHasSql){ if (RecyclestationpriceHasSql) {
allSuperList.addAll(recyclestationpriceList); allSuperList.addAll(recyclestationpriceList);
intersectionSuperList.add(recyclestationpriceList); intersectionSuperList.add(recyclestationpriceList);
superNum++; superNum++;
} }
superOp = superNum > 0 ? superJsonModel.getMatchLogic() : ""; superOp = superNum > 0 ? superJsonModel.getMatchLogic() : "";
//and or //and or
if(superOp.equalsIgnoreCase("and")){ if (superOp.equalsIgnoreCase("and")) {
allSuperIDlist = generaterSwapUtil.getIntersection(intersectionSuperList); allSuperIDlist = generaterSwapUtil.getIntersection(intersectionSuperList);
}else{ } else {
allSuperIDlist = allSuperList; allSuperIDlist = allSuperList;
} }
} }
List<String> allRuleIDlist = new ArrayList<>(); List<String> allRuleIDlist = new ArrayList<>();
String ruleOp =""; String ruleOp = "";
if (ObjectUtil.isNotEmpty(ruleJson)){ if (ObjectUtil.isNotEmpty(ruleJson)) {
List<String> allRuleList = new ArrayList<>(); List<String> allRuleList = new ArrayList<>();
List<List<String>> intersectionRuleList = new ArrayList<>(); List<List<String>> intersectionRuleList = new ArrayList<>();
SuperJsonModel ruleJsonModel = JsonUtil.getJsonToBean(ruleJson, SuperJsonModel.class); SuperJsonModel ruleJsonModel = JsonUtil.getJsonToBean(ruleJson, SuperJsonModel.class);
int ruleNum = 0; int ruleNum = 0;
QueryWrapper<EnterpriserecyclestationEntity> enterpriserecyclestationSuperWrapper = new QueryWrapper<>(); QueryWrapper<EnterpriserecyclestationEntity> enterpriserecyclestationSuperWrapper = new QueryWrapper<>();
enterpriserecyclestationSuperWrapper = generaterSwapUtil.getCondition(new QueryModel(enterpriserecyclestationSuperWrapper,EnterpriserecyclestationEntity.class,ruleJson,"0")); enterpriserecyclestationSuperWrapper = generaterSwapUtil.getCondition(new QueryModel(enterpriserecyclestationSuperWrapper, EnterpriserecyclestationEntity.class, ruleJson, "0"));
int enterpriserecyclestationNum1 = enterpriserecyclestationSuperWrapper.getExpression().getNormal().size(); int enterpriserecyclestationNum1 = enterpriserecyclestationSuperWrapper.getExpression().getNormal().size();
if (enterpriserecyclestationNum1>0){ if (enterpriserecyclestationNum1 > 0) {
List<String> enterpriserecyclestationList =this.list(enterpriserecyclestationSuperWrapper).stream().map(EnterpriserecyclestationEntity::getId).collect(Collectors.toList()); List<String> enterpriserecyclestationList = this.list(enterpriserecyclestationSuperWrapper).stream().map(EnterpriserecyclestationEntity::getId).collect(Collectors.toList());
allRuleList.addAll(enterpriserecyclestationList); allRuleList.addAll(enterpriserecyclestationList);
intersectionRuleList.add(enterpriserecyclestationList); intersectionRuleList.add(enterpriserecyclestationList);
ruleNum++; ruleNum++;
} }
String RecyclestationhousingestateTable = "nx_recycle_station_housing_estate"; String RecyclestationhousingestateTable = "nx_recycle_station_housing_estate";
boolean RecyclestationhousingestateHasSql = ruleJson.contains(RecyclestationhousingestateTable); boolean RecyclestationhousingestateHasSql = ruleJson.contains(RecyclestationhousingestateTable);
List<String> recyclestationhousingestateList = generaterSwapUtil.selectIdsByChildCondition(EnterpriserecyclestationConstant.getTableList(), RecyclestationhousingestateTable , ruleJson, null); List<String> recyclestationhousingestateList = generaterSwapUtil.selectIdsByChildCondition(EnterpriserecyclestationConstant.getTableList(), RecyclestationhousingestateTable, ruleJson, null);
if (RecyclestationhousingestateHasSql){ if (RecyclestationhousingestateHasSql) {
allRuleList.addAll(recyclestationhousingestateList); allRuleList.addAll(recyclestationhousingestateList);
intersectionRuleList.add(recyclestationhousingestateList); intersectionRuleList.add(recyclestationhousingestateList);
ruleNum++; ruleNum++;
} }
String RecyclestationpriceTable = "nx_recycle_station_price"; String RecyclestationpriceTable = "nx_recycle_station_price";
boolean RecyclestationpriceHasSql = ruleJson.contains(RecyclestationpriceTable); boolean RecyclestationpriceHasSql = ruleJson.contains(RecyclestationpriceTable);
List<String> recyclestationpriceList = generaterSwapUtil.selectIdsByChildCondition(EnterpriserecyclestationConstant.getTableList(), RecyclestationpriceTable , ruleJson, null); List<String> recyclestationpriceList = generaterSwapUtil.selectIdsByChildCondition(EnterpriserecyclestationConstant.getTableList(), RecyclestationpriceTable, ruleJson, null);
if (RecyclestationpriceHasSql){ if (RecyclestationpriceHasSql) {
allRuleList.addAll(recyclestationpriceList); allRuleList.addAll(recyclestationpriceList);
intersectionRuleList.add(recyclestationpriceList); intersectionRuleList.add(recyclestationpriceList);
ruleNum++; ruleNum++;
} }
ruleOp = ruleNum > 0 ? ruleJsonModel.getMatchLogic() : ""; ruleOp = ruleNum > 0 ? ruleJsonModel.getMatchLogic() : "";
//and or //and or
if(ruleOp.equalsIgnoreCase("and")){ if (ruleOp.equalsIgnoreCase("and")) {
allRuleIDlist = generaterSwapUtil.getIntersection(intersectionRuleList); allRuleIDlist = generaterSwapUtil.getIntersection(intersectionRuleList);
}else{ } else {
allRuleIDlist = allRuleList; allRuleIDlist = allRuleList;
} }
} }
boolean pcPermission = true; boolean pcPermission = true;
boolean appPermission = false; boolean appPermission = false;
if(isPc && pcPermission){ if (isPc && pcPermission) {
if (!userProvider.get().getIsAdministrator()){ if (!userProvider.get().getIsAdministrator()) {
Object enterpriserecyclestationObj=generaterSwapUtil.getAuthorizeCondition(new QueryModel(enterpriserecyclestationQueryWrapper,EnterpriserecyclestationEntity.class,enterpriserecyclestationPagination.getMenuId(),"0")); Object enterpriserecyclestationObj = generaterSwapUtil.getAuthorizeCondition(new QueryModel(enterpriserecyclestationQueryWrapper, EnterpriserecyclestationEntity.class, enterpriserecyclestationPagination.getMenuId(), "0"));
if (ObjectUtil.isEmpty(enterpriserecyclestationObj)){ if (ObjectUtil.isEmpty(enterpriserecyclestationObj)) {
return new ArrayList<>(); return new ArrayList<>();
} else { } else {
enterpriserecyclestationQueryWrapper = (QueryWrapper<EnterpriserecyclestationEntity>)enterpriserecyclestationObj; enterpriserecyclestationQueryWrapper = (QueryWrapper<EnterpriserecyclestationEntity>) enterpriserecyclestationObj;
if( enterpriserecyclestationQueryWrapper.getExpression().getNormal().size()>0){ if (enterpriserecyclestationQueryWrapper.getExpression().getNormal().size() > 0) {
enterpriserecyclestationNum++; enterpriserecyclestationNum++;
} }
} }
Object recyclestationhousingestateObj=generaterSwapUtil.getAuthorizeCondition(new QueryModel(recyclestationhousingestateQueryWrapper,RecyclestationhousingestateEntity.class,enterpriserecyclestationPagination.getMenuId(),"0")); Object recyclestationhousingestateObj = generaterSwapUtil.getAuthorizeCondition(new QueryModel(recyclestationhousingestateQueryWrapper, RecyclestationhousingestateEntity.class, enterpriserecyclestationPagination.getMenuId(), "0"));
if (ObjectUtil.isEmpty(recyclestationhousingestateObj)){ if (ObjectUtil.isEmpty(recyclestationhousingestateObj)) {
return new ArrayList<>(); return new ArrayList<>();
} else { } else {
recyclestationhousingestateQueryWrapper = (QueryWrapper<RecyclestationhousingestateEntity>)recyclestationhousingestateObj; recyclestationhousingestateQueryWrapper = (QueryWrapper<RecyclestationhousingestateEntity>) recyclestationhousingestateObj;
if( recyclestationhousingestateQueryWrapper.getExpression().getNormal().size()>0){ if (recyclestationhousingestateQueryWrapper.getExpression().getNormal().size() > 0) {
recyclestationhousingestateNum++; recyclestationhousingestateNum++;
} }
} }
Object recyclestationpriceObj=generaterSwapUtil.getAuthorizeCondition(new QueryModel(recyclestationpriceQueryWrapper,RecyclestationpriceEntity.class,enterpriserecyclestationPagination.getMenuId(),"0")); Object recyclestationpriceObj = generaterSwapUtil.getAuthorizeCondition(new QueryModel(recyclestationpriceQueryWrapper, RecyclestationpriceEntity.class, enterpriserecyclestationPagination.getMenuId(), "0"));
if (ObjectUtil.isEmpty(recyclestationpriceObj)){ if (ObjectUtil.isEmpty(recyclestationpriceObj)) {
return new ArrayList<>(); return new ArrayList<>();
} else { } else {
recyclestationpriceQueryWrapper = (QueryWrapper<RecyclestationpriceEntity>)recyclestationpriceObj; recyclestationpriceQueryWrapper = (QueryWrapper<RecyclestationpriceEntity>) recyclestationpriceObj;
if( recyclestationpriceQueryWrapper.getExpression().getNormal().size()>0){ if (recyclestationpriceQueryWrapper.getExpression().getNormal().size() > 0) {
recyclestationpriceNum++; recyclestationpriceNum++;
} }
} }
} }
} }
if(!isPc && appPermission){ if (!isPc && appPermission) {
if (!userProvider.get().getIsAdministrator()){ if (!userProvider.get().getIsAdministrator()) {
Object enterpriserecyclestationObj=generaterSwapUtil.getAuthorizeCondition(new QueryModel(enterpriserecyclestationQueryWrapper,EnterpriserecyclestationEntity.class,enterpriserecyclestationPagination.getMenuId(),"0")); Object enterpriserecyclestationObj = generaterSwapUtil.getAuthorizeCondition(new QueryModel(enterpriserecyclestationQueryWrapper, EnterpriserecyclestationEntity.class, enterpriserecyclestationPagination.getMenuId(), "0"));
if (ObjectUtil.isEmpty(enterpriserecyclestationObj)){ if (ObjectUtil.isEmpty(enterpriserecyclestationObj)) {
return new ArrayList<>(); return new ArrayList<>();
} else { } else {
enterpriserecyclestationQueryWrapper = (QueryWrapper<EnterpriserecyclestationEntity>)enterpriserecyclestationObj; enterpriserecyclestationQueryWrapper = (QueryWrapper<EnterpriserecyclestationEntity>) enterpriserecyclestationObj;
if( enterpriserecyclestationQueryWrapper.getExpression().getNormal().size()>0){ if (enterpriserecyclestationQueryWrapper.getExpression().getNormal().size() > 0) {
enterpriserecyclestationNum++; enterpriserecyclestationNum++;
} }
} }
Object recyclestationhousingestateObj=generaterSwapUtil.getAuthorizeCondition(new QueryModel(recyclestationhousingestateQueryWrapper,RecyclestationhousingestateEntity.class,enterpriserecyclestationPagination.getMenuId(),"0")); Object recyclestationhousingestateObj = generaterSwapUtil.getAuthorizeCondition(new QueryModel(recyclestationhousingestateQueryWrapper, RecyclestationhousingestateEntity.class, enterpriserecyclestationPagination.getMenuId(), "0"));
if (ObjectUtil.isEmpty(recyclestationhousingestateObj)){ if (ObjectUtil.isEmpty(recyclestationhousingestateObj)) {
return new ArrayList<>(); return new ArrayList<>();
} else { } else {
recyclestationhousingestateQueryWrapper = (QueryWrapper<RecyclestationhousingestateEntity>)recyclestationhousingestateObj; recyclestationhousingestateQueryWrapper = (QueryWrapper<RecyclestationhousingestateEntity>) recyclestationhousingestateObj;
if( recyclestationhousingestateQueryWrapper.getExpression().getNormal().size()>0){ if (recyclestationhousingestateQueryWrapper.getExpression().getNormal().size() > 0) {
recyclestationhousingestateNum++; recyclestationhousingestateNum++;
} }
} }
Object recyclestationpriceObj=generaterSwapUtil.getAuthorizeCondition(new QueryModel(recyclestationpriceQueryWrapper,RecyclestationpriceEntity.class,enterpriserecyclestationPagination.getMenuId(),"0")); Object recyclestationpriceObj = generaterSwapUtil.getAuthorizeCondition(new QueryModel(recyclestationpriceQueryWrapper, RecyclestationpriceEntity.class, enterpriserecyclestationPagination.getMenuId(), "0"));
if (ObjectUtil.isEmpty(recyclestationpriceObj)){ if (ObjectUtil.isEmpty(recyclestationpriceObj)) {
return new ArrayList<>(); return new ArrayList<>();
} else { } else {
recyclestationpriceQueryWrapper = (QueryWrapper<RecyclestationpriceEntity>)recyclestationpriceObj; recyclestationpriceQueryWrapper = (QueryWrapper<RecyclestationpriceEntity>) recyclestationpriceObj;
if( recyclestationpriceQueryWrapper.getExpression().getNormal().size()>0){ if (recyclestationpriceQueryWrapper.getExpression().getNormal().size() > 0) {
recyclestationpriceNum++; recyclestationpriceNum++;
} }
} }
@ -227,414 +243,433 @@ public class EnterpriserecyclestationServiceImpl extends ServiceImpl<Enterpriser
} }
} }
if(isPc){ if (isPc) {
if(ObjectUtil.isNotEmpty(enterpriserecyclestationPagination.getTableField135_recycleTypeName())){ if (ObjectUtil.isNotEmpty(enterpriserecyclestationPagination.getTableField135_recycleTypeName())) {
recyclestationpriceNum++; recyclestationpriceNum++;
List<String> idList = new ArrayList<>(); List<String> idList = new ArrayList<>();
try { try {
String[][] recycleTypeName = JsonUtil.getJsonToBean(enterpriserecyclestationPagination.getTableField135_recycleTypeName(),String[][].class); String[][] recycleTypeName = JsonUtil.getJsonToBean(enterpriserecyclestationPagination.getTableField135_recycleTypeName(), String[][].class);
for(int i=0;i<recycleTypeName.length;i++){ for (int i = 0; i < recycleTypeName.length; i++) {
if(recycleTypeName[i].length>0){ if (recycleTypeName[i].length > 0) {
idList.add(JsonUtil.getObjectToString(Arrays.asList(recycleTypeName[i]))); idList.add(JsonUtil.getObjectToString(Arrays.asList(recycleTypeName[i])));
} }
} }
}catch (Exception e1){ } catch (Exception e1) {
try { try {
List<String> recycleTypeName = JsonUtil.getJsonToList(enterpriserecyclestationPagination.getTableField135_recycleTypeName(),String.class); List<String> recycleTypeName = JsonUtil.getJsonToList(enterpriserecyclestationPagination.getTableField135_recycleTypeName(), String.class);
if(recycleTypeName.size()>0){ if (recycleTypeName.size() > 0) {
idList.addAll(recycleTypeName); idList.addAll(recycleTypeName);
} }
}catch (Exception e2){ } catch (Exception e2) {
idList.add(String.valueOf(enterpriserecyclestationPagination.getTableField135_recycleTypeName())); idList.add(String.valueOf(enterpriserecyclestationPagination.getTableField135_recycleTypeName()));
} }
} }
recyclestationpriceQueryWrapper.lambda().and(t->{ recyclestationpriceQueryWrapper.lambda().and(t -> {
idList.forEach(tt->{ idList.forEach(tt -> {
t.like(RecyclestationpriceEntity::getRecycleTypeName, tt).or(); t.like(RecyclestationpriceEntity::getRecycleTypeName, tt).or();
}); });
}); });
} }
if(ObjectUtil.isNotEmpty(enterpriserecyclestationPagination.getTableField119_housingEstateName())){ if (ObjectUtil.isNotEmpty(enterpriserecyclestationPagination.getTableField119_housingEstateName())) {
recyclestationhousingestateNum++; recyclestationhousingestateNum++;
String value = enterpriserecyclestationPagination.getTableField119_housingEstateName() instanceof List ? String value = enterpriserecyclestationPagination.getTableField119_housingEstateName() instanceof List ?
JsonUtil.getObjectToString(enterpriserecyclestationPagination.getTableField119_housingEstateName()) : JsonUtil.getObjectToString(enterpriserecyclestationPagination.getTableField119_housingEstateName()) :
String.valueOf(enterpriserecyclestationPagination.getTableField119_housingEstateName()); String.valueOf(enterpriserecyclestationPagination.getTableField119_housingEstateName());
recyclestationhousingestateQueryWrapper.lambda().like(RecyclestationhousingestateEntity::getHousingEstateName,value); recyclestationhousingestateQueryWrapper.lambda().like(RecyclestationhousingestateEntity::getHousingEstateName, value);
} }
if(ObjectUtil.isNotEmpty(enterpriserecyclestationPagination.getStationCode())){ if (ObjectUtil.isNotEmpty(enterpriserecyclestationPagination.getStationCode())) {
enterpriserecyclestationNum++; enterpriserecyclestationNum++;
String value = enterpriserecyclestationPagination.getStationCode() instanceof List ? String value = enterpriserecyclestationPagination.getStationCode() instanceof List ?
JsonUtil.getObjectToString(enterpriserecyclestationPagination.getStationCode()) : JsonUtil.getObjectToString(enterpriserecyclestationPagination.getStationCode()) :
String.valueOf(enterpriserecyclestationPagination.getStationCode()); String.valueOf(enterpriserecyclestationPagination.getStationCode());
enterpriserecyclestationQueryWrapper.lambda().like(EnterpriserecyclestationEntity::getStationCode,value); enterpriserecyclestationQueryWrapper.lambda().like(EnterpriserecyclestationEntity::getStationCode, value);
} }
if(ObjectUtil.isNotEmpty(enterpriserecyclestationPagination.getStationName())){ if (ObjectUtil.isNotEmpty(enterpriserecyclestationPagination.getStationName())) {
enterpriserecyclestationNum++; enterpriserecyclestationNum++;
String value = enterpriserecyclestationPagination.getStationName() instanceof List ? String value = enterpriserecyclestationPagination.getStationName() instanceof List ?
JsonUtil.getObjectToString(enterpriserecyclestationPagination.getStationName()) : JsonUtil.getObjectToString(enterpriserecyclestationPagination.getStationName()) :
String.valueOf(enterpriserecyclestationPagination.getStationName()); String.valueOf(enterpriserecyclestationPagination.getStationName());
enterpriserecyclestationQueryWrapper.lambda().like(EnterpriserecyclestationEntity::getStationName,value); enterpriserecyclestationQueryWrapper.lambda().like(EnterpriserecyclestationEntity::getStationName, value);
} }
if(ObjectUtil.isNotEmpty(enterpriserecyclestationPagination.getManagementModel())){ if (ObjectUtil.isNotEmpty(enterpriserecyclestationPagination.getManagementModel())) {
enterpriserecyclestationNum++; enterpriserecyclestationNum++;
List<String> idList = new ArrayList<>(); List<String> idList = new ArrayList<>();
try { try {
String[][] managementModel = JsonUtil.getJsonToBean(enterpriserecyclestationPagination.getManagementModel(),String[][].class); String[][] managementModel = JsonUtil.getJsonToBean(enterpriserecyclestationPagination.getManagementModel(), String[][].class);
for(int i=0;i<managementModel.length;i++){ for (int i = 0; i < managementModel.length; i++) {
if(managementModel[i].length>0){ if (managementModel[i].length > 0) {
idList.add(JsonUtil.getObjectToString(Arrays.asList(managementModel[i]))); idList.add(JsonUtil.getObjectToString(Arrays.asList(managementModel[i])));
} }
} }
}catch (Exception e1){ } catch (Exception e1) {
try { try {
List<String> managementModel = JsonUtil.getJsonToList(enterpriserecyclestationPagination.getManagementModel(),String.class); List<String> managementModel = JsonUtil.getJsonToList(enterpriserecyclestationPagination.getManagementModel(), String.class);
if(managementModel.size()>0){ if (managementModel.size() > 0) {
idList.addAll(managementModel); idList.addAll(managementModel);
} }
}catch (Exception e2){ } catch (Exception e2) {
idList.add(String.valueOf(enterpriserecyclestationPagination.getManagementModel())); idList.add(String.valueOf(enterpriserecyclestationPagination.getManagementModel()));
} }
} }
enterpriserecyclestationQueryWrapper.lambda().and(t->{ enterpriserecyclestationQueryWrapper.lambda().and(t -> {
idList.forEach(tt->{ idList.forEach(tt -> {
t.like(EnterpriserecyclestationEntity::getManagementModel, tt).or(); t.like(EnterpriserecyclestationEntity::getManagementModel, tt).or();
}); });
}); });
} }
if(ObjectUtil.isNotEmpty(enterpriserecyclestationPagination.getCity())){ if (ObjectUtil.isNotEmpty(enterpriserecyclestationPagination.getCity())) {
enterpriserecyclestationNum++; enterpriserecyclestationNum++;
List<String> idList = new ArrayList<>(); List<String> idList = new ArrayList<>();
try { try {
String[][] city = JsonUtil.getJsonToBean(enterpriserecyclestationPagination.getCity(),String[][].class); String[][] city = JsonUtil.getJsonToBean(enterpriserecyclestationPagination.getCity(), String[][].class);
for(int i=0;i<city.length;i++){ for (int i = 0; i < city.length; i++) {
if(city[i].length>0){ if (city[i].length > 0) {
idList.add(JsonUtil.getObjectToString(Arrays.asList(city[i]))); idList.add(JsonUtil.getObjectToString(Arrays.asList(city[i])));
} }
} }
}catch (Exception e1){ } catch (Exception e1) {
try { try {
List<String> city = JsonUtil.getJsonToList(enterpriserecyclestationPagination.getCity(),String.class); List<String> city = JsonUtil.getJsonToList(enterpriserecyclestationPagination.getCity(), String.class);
if(city.size()>0){ if (city.size() > 0) {
idList.add(JsonUtil.getObjectToString(city)); idList.add(JsonUtil.getObjectToString(city));
} }
}catch (Exception e2){ } catch (Exception e2) {
idList.add(String.valueOf(enterpriserecyclestationPagination.getCity())); idList.add(String.valueOf(enterpriserecyclestationPagination.getCity()));
} }
} }
enterpriserecyclestationQueryWrapper.lambda().and(t->{ enterpriserecyclestationQueryWrapper.lambda().and(t -> {
idList.forEach(tt->{ idList.forEach(tt -> {
t.like(EnterpriserecyclestationEntity::getCity, tt).or(); t.like(EnterpriserecyclestationEntity::getCity, tt).or();
}); });
}); });
} }
if(ObjectUtil.isNotEmpty(enterpriserecyclestationPagination.getRecycleTypeIds())){ if (ObjectUtil.isNotEmpty(enterpriserecyclestationPagination.getRecycleTypeIds())) {
enterpriserecyclestationNum++; enterpriserecyclestationNum++;
List<String> idList = new ArrayList<>(); List<String> idList = new ArrayList<>();
try { try {
String[][] recycleTypeIds = JsonUtil.getJsonToBean(enterpriserecyclestationPagination.getRecycleTypeIds(),String[][].class); String[][] recycleTypeIds = JsonUtil.getJsonToBean(enterpriserecyclestationPagination.getRecycleTypeIds(), String[][].class);
for(int i=0;i<recycleTypeIds.length;i++){ for (int i = 0; i < recycleTypeIds.length; i++) {
if(recycleTypeIds[i].length>0){ if (recycleTypeIds[i].length > 0) {
idList.add(JsonUtil.getObjectToString(Arrays.asList(recycleTypeIds[i]))); idList.add(JsonUtil.getObjectToString(Arrays.asList(recycleTypeIds[i])));
} }
} }
}catch (Exception e1){ } catch (Exception e1) {
try { try {
List<String> recycleTypeIds = JsonUtil.getJsonToList(enterpriserecyclestationPagination.getRecycleTypeIds(),String.class); List<String> recycleTypeIds = JsonUtil.getJsonToList(enterpriserecyclestationPagination.getRecycleTypeIds(), String.class);
if(recycleTypeIds.size()>0){ if (recycleTypeIds.size() > 0) {
idList.addAll(recycleTypeIds); idList.addAll(recycleTypeIds);
} }
}catch (Exception e2){ } catch (Exception e2) {
idList.add(String.valueOf(enterpriserecyclestationPagination.getRecycleTypeIds())); idList.add(String.valueOf(enterpriserecyclestationPagination.getRecycleTypeIds()));
} }
} }
enterpriserecyclestationQueryWrapper.lambda().and(t->{ enterpriserecyclestationQueryWrapper.lambda().and(t -> {
idList.forEach(tt->{ idList.forEach(tt -> {
t.like(EnterpriserecyclestationEntity::getRecycleTypeIds, tt).or(); t.like(EnterpriserecyclestationEntity::getRecycleTypeIds, tt).or();
}); });
}); });
} }
if(ObjectUtil.isNotEmpty(enterpriserecyclestationPagination.getFirstContactPerson())){ if (ObjectUtil.isNotEmpty(enterpriserecyclestationPagination.getFirstContactPerson())) {
enterpriserecyclestationNum++; enterpriserecyclestationNum++;
String value = enterpriserecyclestationPagination.getFirstContactPerson() instanceof List ? String value = enterpriserecyclestationPagination.getFirstContactPerson() instanceof List ?
JsonUtil.getObjectToString(enterpriserecyclestationPagination.getFirstContactPerson()) : JsonUtil.getObjectToString(enterpriserecyclestationPagination.getFirstContactPerson()) :
String.valueOf(enterpriserecyclestationPagination.getFirstContactPerson()); String.valueOf(enterpriserecyclestationPagination.getFirstContactPerson());
enterpriserecyclestationQueryWrapper.lambda().like(EnterpriserecyclestationEntity::getFirstContactPerson,value); enterpriserecyclestationQueryWrapper.lambda().like(EnterpriserecyclestationEntity::getFirstContactPerson, value);
} }
if(ObjectUtil.isNotEmpty(enterpriserecyclestationPagination.getShortName())){ if (ObjectUtil.isNotEmpty(enterpriserecyclestationPagination.getShortName())) {
enterpriserecyclestationNum++; enterpriserecyclestationNum++;
String value = enterpriserecyclestationPagination.getShortName() instanceof List ? String value = enterpriserecyclestationPagination.getShortName() instanceof List ?
JsonUtil.getObjectToString(enterpriserecyclestationPagination.getShortName()) : JsonUtil.getObjectToString(enterpriserecyclestationPagination.getShortName()) :
String.valueOf(enterpriserecyclestationPagination.getShortName()); String.valueOf(enterpriserecyclestationPagination.getShortName());
enterpriserecyclestationQueryWrapper.lambda().like(EnterpriserecyclestationEntity::getShortName,value); enterpriserecyclestationQueryWrapper.lambda().like(EnterpriserecyclestationEntity::getShortName, value);
} }
} }
if(recyclestationhousingestateNum>0){ if (recyclestationhousingestateNum > 0) {
List<String> recyclestationhousingestateIdList = recyclestationhousingestateService.list(recyclestationhousingestateQueryWrapper).stream().filter(t->StringUtil.isNotEmpty(t.getStationId())).map(t->t.getStationId()).collect(Collectors.toList()); List<String> recyclestationhousingestateIdList = recyclestationhousingestateService.list(recyclestationhousingestateQueryWrapper).stream().filter(t -> StringUtil.isNotEmpty(t.getStationId())).map(t -> t.getStationId()).collect(Collectors.toList());
long count = recyclestationhousingestateService.count(); long count = recyclestationhousingestateService.count();
if (count>0){ if (count > 0) {
intersectionList.add(recyclestationhousingestateIdList); intersectionList.add(recyclestationhousingestateIdList);
} }
AllIdList.addAll(recyclestationhousingestateIdList); AllIdList.addAll(recyclestationhousingestateIdList);
} }
total+=recyclestationhousingestateNum; total += recyclestationhousingestateNum;
if(recyclestationpriceNum>0){ if (recyclestationpriceNum > 0) {
List<String> recyclestationpriceIdList = recyclestationpriceService.list(recyclestationpriceQueryWrapper).stream().filter(t->StringUtil.isNotEmpty(t.getStationId())).map(t->t.getStationId()).collect(Collectors.toList()); List<String> recyclestationpriceIdList = recyclestationpriceService.list(recyclestationpriceQueryWrapper).stream().filter(t -> StringUtil.isNotEmpty(t.getStationId())).map(t -> t.getStationId()).collect(Collectors.toList());
long count = recyclestationpriceService.count(); long count = recyclestationpriceService.count();
if (count>0){ if (count > 0) {
intersectionList.add(recyclestationpriceIdList); intersectionList.add(recyclestationpriceIdList);
} }
AllIdList.addAll(recyclestationpriceIdList); AllIdList.addAll(recyclestationpriceIdList);
} }
total+=recyclestationpriceNum; total += recyclestationpriceNum;
List<String> intersection = generaterSwapUtil.getIntersection(intersectionList); List<String> intersection = generaterSwapUtil.getIntersection(intersectionList);
if (total>0){ if (total > 0) {
if (intersection.size()==0){ if (intersection.size() == 0) {
intersection.add("jnpfNullList"); intersection.add("jnpfNullList");
} }
enterpriserecyclestationQueryWrapper.lambda().in(EnterpriserecyclestationEntity::getId, intersection); enterpriserecyclestationQueryWrapper.lambda().in(EnterpriserecyclestationEntity::getId, intersection);
} }
//是否有高级查询 //是否有高级查询
if (StringUtil.isNotEmpty(superOp)){ if (StringUtil.isNotEmpty(superOp)) {
if (allSuperIDlist.size()==0){ if (allSuperIDlist.size() == 0) {
allSuperIDlist.add("jnpfNullList"); allSuperIDlist.add("jnpfNullList");
} }
List<String> finalAllSuperIDlist = allSuperIDlist; List<String> finalAllSuperIDlist = allSuperIDlist;
enterpriserecyclestationQueryWrapper.lambda().and(t->t.in(EnterpriserecyclestationEntity::getId, finalAllSuperIDlist)); enterpriserecyclestationQueryWrapper.lambda().and(t -> t.in(EnterpriserecyclestationEntity::getId, finalAllSuperIDlist));
} }
//是否有数据过滤查询 //是否有数据过滤查询
if (StringUtil.isNotEmpty(ruleOp)){ if (StringUtil.isNotEmpty(ruleOp)) {
if (allRuleIDlist.size()==0){ if (allRuleIDlist.size() == 0) {
allRuleIDlist.add("jnpfNullList"); allRuleIDlist.add("jnpfNullList");
} }
List<String> finalAllRuleIDlist = allRuleIDlist; List<String> finalAllRuleIDlist = allRuleIDlist;
enterpriserecyclestationQueryWrapper.lambda().and(t->t.in(EnterpriserecyclestationEntity::getId, finalAllRuleIDlist)); enterpriserecyclestationQueryWrapper.lambda().and(t -> t.in(EnterpriserecyclestationEntity::getId, finalAllRuleIDlist));
} }
//排序 //排序
if(StringUtil.isEmpty(enterpriserecyclestationPagination.getSidx())){ if (StringUtil.isEmpty(enterpriserecyclestationPagination.getSidx())) {
enterpriserecyclestationQueryWrapper.lambda().orderByDesc(EnterpriserecyclestationEntity::getId); enterpriserecyclestationQueryWrapper.lambda().orderByDesc(EnterpriserecyclestationEntity::getId);
}else{ } else {
try { try {
String sidx = enterpriserecyclestationPagination.getSidx(); String sidx = enterpriserecyclestationPagination.getSidx();
String[] strs= sidx.split("_name"); String[] strs = sidx.split("_name");
EnterpriserecyclestationEntity enterpriserecyclestationEntity = new EnterpriserecyclestationEntity(); EnterpriserecyclestationEntity enterpriserecyclestationEntity = new EnterpriserecyclestationEntity();
Field declaredField = enterpriserecyclestationEntity.getClass().getDeclaredField(strs[0]); Field declaredField = enterpriserecyclestationEntity.getClass().getDeclaredField(strs[0]);
declaredField.setAccessible(true); declaredField.setAccessible(true);
String value = declaredField.getAnnotation(TableField.class).value(); String value = declaredField.getAnnotation(TableField.class).value();
enterpriserecyclestationQueryWrapper="asc".equals(enterpriserecyclestationPagination.getSort().toLowerCase())?enterpriserecyclestationQueryWrapper.orderByAsc(value):enterpriserecyclestationQueryWrapper.orderByDesc(value); enterpriserecyclestationQueryWrapper = "asc".equals(enterpriserecyclestationPagination.getSort().toLowerCase()) ? enterpriserecyclestationQueryWrapper.orderByAsc(value) : enterpriserecyclestationQueryWrapper.orderByDesc(value);
} catch (NoSuchFieldException e) { } catch (NoSuchFieldException e) {
e.printStackTrace(); e.printStackTrace();
} }
} }
if("0".equals(dataType)){ if ("0".equals(dataType)) {
if((total>0 && AllIdList.size()>0) || total==0){ if ((total > 0 && AllIdList.size() > 0) || total == 0) {
Page<EnterpriserecyclestationEntity> page=new Page<>(enterpriserecyclestationPagination.getCurrentPage(), enterpriserecyclestationPagination.getPageSize()); Page<EnterpriserecyclestationEntity> page = new Page<>(enterpriserecyclestationPagination.getCurrentPage(), enterpriserecyclestationPagination.getPageSize());
IPage<EnterpriserecyclestationEntity> userIPage=this.page(page, enterpriserecyclestationQueryWrapper); IPage<EnterpriserecyclestationEntity> userIPage = this.page(page, enterpriserecyclestationQueryWrapper);
return enterpriserecyclestationPagination.setData(userIPage.getRecords(),userIPage.getTotal()); return enterpriserecyclestationPagination.setData(userIPage.getRecords(), userIPage.getTotal());
}else{ } else {
List<EnterpriserecyclestationEntity> list = new ArrayList(); List<EnterpriserecyclestationEntity> list = new ArrayList();
return enterpriserecyclestationPagination.setData(list, list.size()); return enterpriserecyclestationPagination.setData(list, list.size());
} }
}else{ } else {
return this.list(enterpriserecyclestationQueryWrapper); return this.list(enterpriserecyclestationQueryWrapper);
} }
} }
@Override @Override
public EnterpriserecyclestationEntity getInfo(String id){ public EnterpriserecyclestationEntity getInfo(String id) {
QueryWrapper<EnterpriserecyclestationEntity> queryWrapper=new QueryWrapper<>(); QueryWrapper<EnterpriserecyclestationEntity> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().eq(EnterpriserecyclestationEntity::getId,id); queryWrapper.lambda().eq(EnterpriserecyclestationEntity::getId, id);
return this.getOne(queryWrapper); return this.getOne(queryWrapper);
} }
@Override @Override
public void create(EnterpriserecyclestationEntity entity){ public void create(EnterpriserecyclestationEntity entity) {
this.save(entity); this.save(entity);
} }
@Override @Override
public boolean update(String id, EnterpriserecyclestationEntity entity){ public boolean update(String id, EnterpriserecyclestationEntity entity) {
return this.updateById(entity); return this.updateById(entity);
} }
@Override @Override
public void delete(EnterpriserecyclestationEntity entity){ public void delete(EnterpriserecyclestationEntity entity) {
if(entity!=null){ if (entity != null) {
this.removeById(entity.getId()); this.removeById(entity.getId());
} }
} }
/** Recyclestationprice子表方法 */
/**
* Recyclestationprice子表方法
*/
@Override @Override
public List<RecyclestationpriceEntity> getRecyclestationpriceList(String id,EnterpriserecyclestationPagination enterpriserecyclestationPagination){ public List<RecyclestationpriceEntity> getRecyclestationpriceList(String id, EnterpriserecyclestationPagination enterpriserecyclestationPagination) {
Map<String, Object> newtabMap=EnterpriserecyclestationConstant.TABLEFIELDKEY.entrySet() Map<String, Object> newtabMap = EnterpriserecyclestationConstant.TABLEFIELDKEY.entrySet()
.stream().collect( Collectors.toMap(e->e.getValue(),e->e.getKey())); .stream().collect(Collectors.toMap(e -> e.getValue(), e -> e.getKey()));
String tableName="recyclestationprice"; String tableName = "recyclestationprice";
tableName=newtabMap.get(tableName)==null?tableName:newtabMap.get(tableName).toString(); tableName = newtabMap.get(tableName) == null ? tableName : newtabMap.get(tableName).toString();
QueryWrapper<RecyclestationpriceEntity> queryWrapper = new QueryWrapper<>(); QueryWrapper<RecyclestationpriceEntity> queryWrapper = new QueryWrapper<>();
queryWrapper = recyclestationpriceService.getChild(enterpriserecyclestationPagination,queryWrapper); queryWrapper = recyclestationpriceService.getChild(enterpriserecyclestationPagination, queryWrapper);
queryWrapper.lambda().eq(RecyclestationpriceEntity::getStationId, id); queryWrapper.lambda().eq(RecyclestationpriceEntity::getStationId, id);
generaterSwapUtil.wrapperHandle(EnterpriserecyclestationConstant.getColumnData(), EnterpriserecyclestationConstant.getAppColumnData(), queryWrapper,RecyclestationpriceEntity.class,"sub",tableName); generaterSwapUtil.wrapperHandle(EnterpriserecyclestationConstant.getColumnData(), EnterpriserecyclestationConstant.getAppColumnData(), queryWrapper, RecyclestationpriceEntity.class, "sub", tableName);
return recyclestationpriceService.list(queryWrapper); return recyclestationpriceService.list(queryWrapper);
} }
/** Recyclestationprice子表方法 */ /**
* Recyclestationprice子表方法
*/
@Override @Override
public List<RecyclestationpriceEntity> getRecyclestationpriceList(String id){ public List<RecyclestationpriceEntity> getRecyclestationpriceList(String id) {
QueryWrapper<RecyclestationpriceEntity> queryWrapper = new QueryWrapper<>(); QueryWrapper<RecyclestationpriceEntity> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().eq(RecyclestationpriceEntity::getStationId, id); queryWrapper.lambda().eq(RecyclestationpriceEntity::getStationId, id);
return recyclestationpriceService.list(queryWrapper); return recyclestationpriceService.list(queryWrapper);
} }
/** Recyclestationhousingestate子表方法 */
/**
* Recyclestationhousingestate子表方法
*/
@Override @Override
public List<RecyclestationhousingestateEntity> getRecyclestationhousingestateList(String id,EnterpriserecyclestationPagination enterpriserecyclestationPagination){ public List<RecyclestationhousingestateEntity> getRecyclestationhousingestateList(String id, EnterpriserecyclestationPagination enterpriserecyclestationPagination) {
Map<String, Object> newtabMap=EnterpriserecyclestationConstant.TABLEFIELDKEY.entrySet() Map<String, Object> newtabMap = EnterpriserecyclestationConstant.TABLEFIELDKEY.entrySet()
.stream().collect( Collectors.toMap(e->e.getValue(),e->e.getKey())); .stream().collect(Collectors.toMap(e -> e.getValue(), e -> e.getKey()));
String tableName="recyclestationhousingestate"; String tableName = "recyclestationhousingestate";
tableName=newtabMap.get(tableName)==null?tableName:newtabMap.get(tableName).toString(); tableName = newtabMap.get(tableName) == null ? tableName : newtabMap.get(tableName).toString();
QueryWrapper<RecyclestationhousingestateEntity> queryWrapper = new QueryWrapper<>(); QueryWrapper<RecyclestationhousingestateEntity> queryWrapper = new QueryWrapper<>();
queryWrapper = recyclestationhousingestateService.getChild(enterpriserecyclestationPagination,queryWrapper); queryWrapper = recyclestationhousingestateService.getChild(enterpriserecyclestationPagination, queryWrapper);
queryWrapper.lambda().eq(RecyclestationhousingestateEntity::getStationId, id); queryWrapper.lambda().eq(RecyclestationhousingestateEntity::getStationId, id);
generaterSwapUtil.wrapperHandle(EnterpriserecyclestationConstant.getColumnData(), EnterpriserecyclestationConstant.getAppColumnData(), queryWrapper,RecyclestationhousingestateEntity.class,"sub",tableName); generaterSwapUtil.wrapperHandle(EnterpriserecyclestationConstant.getColumnData(), EnterpriserecyclestationConstant.getAppColumnData(), queryWrapper, RecyclestationhousingestateEntity.class, "sub", tableName);
return recyclestationhousingestateService.list(queryWrapper); return recyclestationhousingestateService.list(queryWrapper);
} }
/** Recyclestationhousingestate子表方法 */ /**
* Recyclestationhousingestate子表方法
*/
@Override @Override
public List<RecyclestationhousingestateEntity> getRecyclestationhousingestateList(String id){ public List<RecyclestationhousingestateEntity> getRecyclestationhousingestateList(String id) {
QueryWrapper<RecyclestationhousingestateEntity> queryWrapper = new QueryWrapper<>(); QueryWrapper<RecyclestationhousingestateEntity> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().eq(RecyclestationhousingestateEntity::getStationId, id); queryWrapper.lambda().eq(RecyclestationhousingestateEntity::getStationId, id);
return recyclestationhousingestateService.list(queryWrapper); return recyclestationhousingestateService.list(queryWrapper);
} }
/** 验证表单唯一字段，正则，非空 i-0新增-1修改*/
/**
* 验证表单唯一字段，正则，非空 i-0新增-1修改
*/
@Override @Override
public String checkForm(EnterpriserecyclestationForm form,int i) { public String checkForm(EnterpriserecyclestationForm form, int i) {
boolean isUp =StringUtil.isNotEmpty(form.getId()) && !form.getId().equals("0"); boolean isUp = StringUtil.isNotEmpty(form.getId()) && !form.getId().equals("0");
String id=""; String id = "";
String countRecover = ""; String countRecover = "";
if (isUp){ if (isUp) {
id = form.getId(); id = form.getId();
} }
//主表字段验证 //主表字段验证
if(StringUtil.isEmpty(form.getStationName())){ if (StringUtil.isEmpty(form.getStationName())) {
return "回收站名称不能为空"; return "回收站名称不能为空";
} }
if(StringUtil.isEmpty(form.getFirstContactPerson())){ if (StringUtil.isEmpty(form.getFirstContactPerson())) {
return "首联系人不能为空"; return "首联系人不能为空";
} }
if(StringUtil.isEmpty(form.getFirstContactPersonTel())){ if (StringUtil.isEmpty(form.getFirstContactPersonTel())) {
return "手机号码不能为空"; return "手机号码不能为空";
} }
if(StringUtil.isEmpty(form.getAddress())){ if (StringUtil.isEmpty(form.getAddress())) {
return "详细地址不能为空"; return "详细地址不能为空";
} }
if(StringUtil.isEmpty(form.getRecycleTel())){ if (StringUtil.isEmpty(form.getRecycleTel())) {
return "回收电话不能为空"; return "回收电话不能为空";
} }
if(StringUtil.isNotEmpty(form.getRecycleTel())){ if (StringUtil.isNotEmpty(form.getRecycleTel())) {
if(!Pattern.compile("^1[3456789]\\d{9}$|^0\\d{2,3}-?\\d{7,8}$").matcher(String.valueOf(form.getRecycleTel())).matches()){ if (!Pattern.compile("^1[3456789]\\d{9}$|^0\\d{2,3}-?\\d{7,8}$").matcher(String.valueOf(form.getRecycleTel())).matches()) {
return "请输入正确的联系方式"; return "请输入正确的联系方式";
} }
} }
//子表字段验证 //子表字段验证
if (form.getRecyclestationpriceList()!=null){ if (form.getRecyclestationpriceList() != null) {
} }
if (form.getRecyclestationhousingestateList()!=null){ if (form.getRecyclestationhousingestateList() != null) {
} }
return countRecover; return countRecover;
} }
/** /**
* 新增修改数据(事务回滚) * 新增修改数据(事务回滚)
*
* @param id * @param id
* @param enterpriserecyclestationForm * @param enterpriserecyclestationForm
* @return * @return
*/ */
@Override @Override
@Transactional @Transactional
public void saveOrUpdate(EnterpriserecyclestationForm enterpriserecyclestationForm,String id, boolean isSave) throws Exception{ public void saveOrUpdate(EnterpriserecyclestationForm enterpriserecyclestationForm, String id, boolean isSave) throws Exception {
UserInfo userInfo=userProvider.get(); UserInfo userInfo = userProvider.get();
UserEntity userEntity = generaterSwapUtil.getUser(userInfo.getUserId()); UserEntity userEntity = generaterSwapUtil.getUser(userInfo.getUserId());
enterpriserecyclestationForm = JsonUtil.getJsonToBean( enterpriserecyclestationForm = JsonUtil.getJsonToBean(
generaterSwapUtil.swapDatetime(EnterpriserecyclestationConstant.getFormData(),enterpriserecyclestationForm),EnterpriserecyclestationForm.class); generaterSwapUtil.swapDatetime(EnterpriserecyclestationConstant.getFormData(), enterpriserecyclestationForm), EnterpriserecyclestationForm.class);
EnterpriserecyclestationEntity entity = JsonUtil.getJsonToBean(enterpriserecyclestationForm, EnterpriserecyclestationEntity.class); EnterpriserecyclestationEntity entity = JsonUtil.getJsonToBean(enterpriserecyclestationForm, EnterpriserecyclestationEntity.class);
if(isSave){ if (isSave) {
String mainId = RandomUtil.uuId() ; String mainId = RandomUtil.uuId();
entity.setStationCode(generaterSwapUtil.getBillNumber("huishou", false)); entity.setStationCode(generaterSwapUtil.getBillNumber("huishou", false));
entity.setId(mainId); entity.setId(mainId);
}else{ } else {
entity.setStationCode(generaterSwapUtil.getBillNumber("huishou", false)); entity.setStationCode(generaterSwapUtil.getBillNumber("huishou", false));
} }
this.saveOrUpdate(entity); this.saveOrUpdate(entity);
//Recyclestationprice子表数据新增修改 //Recyclestationprice子表数据新增修改
if(!isSave){ if (!isSave) {
QueryWrapper<RecyclestationpriceEntity> RecyclestationpricequeryWrapper = new QueryWrapper<>(); QueryWrapper<RecyclestationpriceEntity> RecyclestationpricequeryWrapper = new QueryWrapper<>();
RecyclestationpricequeryWrapper.lambda().eq(RecyclestationpriceEntity::getStationId, entity.getId()); RecyclestationpricequeryWrapper.lambda().eq(RecyclestationpriceEntity::getStationId, entity.getId());
recyclestationpriceService.remove(RecyclestationpricequeryWrapper); recyclestationpriceService.remove(RecyclestationpricequeryWrapper);
} }
if (enterpriserecyclestationForm.getRecyclestationpriceList()!=null){ if (enterpriserecyclestationForm.getRecyclestationpriceList() != null) {
List<RecyclestationpriceEntity> tableField135 = JsonUtil.getJsonToList(enterpriserecyclestationForm.getRecyclestationpriceList(),RecyclestationpriceEntity.class); List<RecyclestationpriceEntity> tableField135 = JsonUtil.getJsonToList(enterpriserecyclestationForm.getRecyclestationpriceList(), RecyclestationpriceEntity.class);
for(RecyclestationpriceEntity entitys : tableField135){ for (RecyclestationpriceEntity entitys : tableField135) {
entitys.setId(RandomUtil.uuId()); entitys.setId(RandomUtil.uuId());
entitys.setStationId(entity.getId()); entitys.setStationId(entity.getId());
if(isSave){ if (isSave) {
}else{ } else {
} }
recyclestationpriceService.saveOrUpdate(entitys); recyclestationpriceService.saveOrUpdate(entitys);
} }
} }
//Recyclestationhousingestate子表数据新增修改 //Recyclestationhousingestate子表数据新增修改
if(!isSave){ if (!isSave) {
QueryWrapper<RecyclestationhousingestateEntity> RecyclestationhousingestatequeryWrapper = new QueryWrapper<>(); QueryWrapper<RecyclestationhousingestateEntity> RecyclestationhousingestatequeryWrapper = new QueryWrapper<>();
RecyclestationhousingestatequeryWrapper.lambda().eq(RecyclestationhousingestateEntity::getStationId, entity.getId()); RecyclestationhousingestatequeryWrapper.lambda().eq(RecyclestationhousingestateEntity::getStationId, entity.getId());
recyclestationhousingestateService.remove(RecyclestationhousingestatequeryWrapper); recyclestationhousingestateService.remove(RecyclestationhousingestatequeryWrapper);
} }
if (enterpriserecyclestationForm.getRecyclestationhousingestateList()!=null){ if (enterpriserecyclestationForm.getRecyclestationhousingestateList() != null) {
List<RecyclestationhousingestateEntity> tableField119 = JsonUtil.getJsonToList(enterpriserecyclestationForm.getRecyclestationhousingestateList(),RecyclestationhousingestateEntity.class); List<RecyclestationhousingestateEntity> tableField119 = JsonUtil.getJsonToList(enterpriserecyclestationForm.getRecyclestationhousingestateList(), RecyclestationhousingestateEntity.class);
for(RecyclestationhousingestateEntity entitys : tableField119){ for (RecyclestationhousingestateEntity entitys : tableField119) {
entitys.setId(RandomUtil.uuId()); entitys.setId(RandomUtil.uuId());
entitys.setStationId(entity.getId()); entitys.setStationId(entity.getId());
//修改存储新的回收站id //修改存储新的回收站id
QueryWrapper<HousingEstateEntity> queryWrapper =new QueryWrapper<>(); QueryWrapper<HousingEstateEntity> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().eq(HousingEstateEntity::getId, entitys.getHousingEstateId()); queryWrapper.lambda().eq(HousingEstateEntity::getId, entitys.getHousingEstateId());
List<HousingEstateEntity> housingEstateEntityList = housingEstateService.list(queryWrapper); List<HousingEstateEntity> housingEstateEntityList = housingEstateService.list(queryWrapper);
if (housingEstateEntityList.size()>0){ if (housingEstateEntityList.size() > 0) {
for (HousingEstateEntity housingEstateEntity: housingEstateEntityList) { for (HousingEstateEntity housingEstateEntity : housingEstateEntityList) {
housingEstateEntity.setStationId(entity.getId()); housingEstateEntity.setStationId(entity.getId());
} }
} }
housingEstateService.updateBatchById(housingEstateEntityList); housingEstateService.updateBatchById(housingEstateEntityList);
if(isSave){ if (isSave) {
}else{ } else {
} }
recyclestationhousingestateService.saveOrUpdate(entitys); recyclestationhousingestateService.saveOrUpdate(entitys);
@ -644,9 +679,10 @@ public class EnterpriserecyclestationServiceImpl extends ServiceImpl<Enterpriser
} }
@Override @Override
public List<EnterpriserecyclestationEntity> getListByCompanyId(String enterprise_id) { public List<EnterpriserecyclestationEntity> getListByCompanyId(String companyId) {
QueryWrapper<EnterpriserecyclestationEntity> wrapper = new QueryWrapper<>(); QueryWrapper<EnterpriserecyclestationEntity> wrapper = new QueryWrapper<>();
wrapper.eq("enterprise_id", enterprise_id); wrapper.eq("company_id", companyId);
return null; List<EnterpriserecyclestationEntity> list = this.list(wrapper);
return list;
} }
} }

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

@ -1,54 +1,39 @@
package jnpf.service.impl; 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 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 com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
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.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
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.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.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; 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 jnpf.base.UserInfo; import java.lang.reflect.Field;
import jnpf.permission.entity.UserEntity; import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.stream.Collectors;
/** /**
* 商户经营区域 * 商户经营区域
* 版本： V3.5 * 版本： V3.5
* 版权： 引迈信息技术有限公司（https://www.jnpfsoft.com） * 版权： 引迈信息技术有限公司（https://www.jnpfsoft.com）
* 作者： JNPF开发平台组 * 作者： JNPF开发平台组
* 日期： 2024-05-21 * 日期： 2024-05-23
*/ */
@Service @Service
public class StationAreaServiceImpl extends ServiceImpl<StationAreaMapper, StationAreaEntity> implements StationAreaService { public class StationAreaServiceImpl extends ServiceImpl<StationAreaMapper, StationAreaEntity> implements StationAreaService {
@ -356,9 +341,8 @@ public class StationAreaServiceImpl extends ServiceImpl<StationAreaMapper, Stati
entity.setCreatorUserId(userInfo.getUserId()); entity.setCreatorUserId(userInfo.getUserId());
entity.setCreatorTime(DateUtil.getNowDate()); entity.setCreatorTime(DateUtil.getNowDate());
entity.setOrganizeJsonId(generaterSwapUtil.getCurrentOrgIds(userInfo.getOrganizeId(), "all")); entity.setOrganizeJsonId(generaterSwapUtil.getCurrentOrgIds(userInfo.getOrganizeId(), "all"));
entity.setLastModifyUserId(userInfo.getUserId()); entity.setLastModifyUserId(null);
entity.setLastModifyTime(DateUtil.getNowDate()); entity.setLastModifyTime(null);
entity.setCompanyId(generaterSwapUtil.getCurrentOrgIds(userInfo.getOrganizeId(),"company"));
entity.setId(mainId); entity.setId(mainId);
} else { } else {
entity.setCreatorUserId(userInfo.getUserId()); entity.setCreatorUserId(userInfo.getUserId());
@ -366,9 +350,18 @@ public class StationAreaServiceImpl extends ServiceImpl<StationAreaMapper, Stati
entity.setOrganizeJsonId(generaterSwapUtil.getCurrentOrgIds(userInfo.getOrganizeId(), "all")); entity.setOrganizeJsonId(generaterSwapUtil.getCurrentOrgIds(userInfo.getOrganizeId(), "all"));
entity.setLastModifyUserId(null); entity.setLastModifyUserId(null);
entity.setLastModifyTime(null); entity.setLastModifyTime(null);
entity.setCompanyId(generaterSwapUtil.getCurrentOrgIds(userInfo.getOrganizeId(),"company"));
} }
this.saveOrUpdate(entity); this.saveOrUpdate(entity);
} }
@Override
public List<StationAreaEntity> getOthersArea(String id) {
QueryWrapper<StationAreaEntity> wrapper = new QueryWrapper<>();
if (StringUtil.isNotEmpty(id)) {
wrapper.ne("id", id);
}
List<StationAreaEntity> list = this.list(wrapper);
return list;
}
} }

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

@ -1,39 +1,34 @@
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.EnterpriserecyclestationEntity;
import jnpf.service.*; import jnpf.entity.StationAreaEntity;
import jnpf.entity.*; import jnpf.model.stationarea.Position;
import jnpf.util.*; import jnpf.model.stationarea.StationAreaConstant;
import jnpf.model.stationarea.*; 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 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.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.io.IOException;
import java.util.stream.Collectors; import java.math.BigDecimal;
import java.util.ArrayList;
import jnpf.engine.entity.FlowTaskEntity; import java.util.List;
import jnpf.exception.WorkFlowException; import java.util.Map;
import org.springframework.transaction.annotation.Transactional;
/** /**
* 商户经营区域 * 商户经营区域
@ -41,7 +36,7 @@ import org.springframework.transaction.annotation.Transactional;
* @版本： V3.5 * @版本： V3.5
* @版权： 引迈信息技术有限公司（https://www.jnpfsoft.com） * @版权： 引迈信息技术有限公司（https://www.jnpfsoft.com）
* @作者： JNPF开发平台组 * @作者： JNPF开发平台组
* @日期： 2024-05-21 * @日期： 2024-05-23
*/ */
@Slf4j @Slf4j
@RestController @RestController
@ -251,4 +246,11 @@ public class StationAreaController {
} }
} }
@PostMapping("/getOthersArea/{id}")
@Operation(summary = "获取非当前编辑的其他区域信息")
public ActionResult getOthersArea(@PathVariable(name = "id",required = false,value = "") String id) {
List<StationAreaEntity> othersArea = stationAreaService.getOthersArea(id);
return ActionResult.success(othersArea);
}
} }

10
jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/stationarea/StationAreaConstant.java
View File

File diff suppressed because one or more lines are too long

1
jnpf-java-boot/jnpf-web/public/index.html
Unescape View File

@ -20,6 +20,7 @@
<!-- 先在vue的index.html里面引入腾讯地图包 --> <!-- 先在vue的index.html里面引入腾讯地图包 -->
<script charset="utf-8" src="https://map.qq.com/api/js?v=2.exp&key=U24BZ-7UECT-ZSNXI-L3GJD-GZD3E-3YFF6&libraries=drawing"></script> <script charset="utf-8" src="https://map.qq.com/api/js?v=2.exp&key=U24BZ-7UECT-ZSNXI-L3GJD-GZD3E-3YFF6&libraries=drawing"></script>
<script src="https://mapapi.qq.com/web/mapComponents/geoLocation/v/geolocation.min.js"></script> <script src="https://mapapi.qq.com/web/mapComponents/geoLocation/v/geolocation.min.js"></script>
<script src="https://map.qq.com/api/gljs?v=1.exp&key=U24BZ-7UECT-ZSNXI-L3GJD-GZD3E-3YFF6&libraries=tools"></script>
<!-- <script type="text/javascript" src="//api.map.baidu.com/api?v=2.0&ak=nYAafE0e8IXpGM0ykV3BO2k7CVRHI79Y"></script> --> <!-- <script type="text/javascript" src="//api.map.baidu.com/api?v=2.0&ak=nYAafE0e8IXpGM0ykV3BO2k7CVRHI79Y"></script> -->
</head> </head>

14
jnpf-java-boot/jnpf-web/src/views/stationarea/Detail.vue
Unescape View File

@ -25,15 +25,15 @@
</jnpf-form-tip-item> </jnpf-form-tip-item>
</el-col> </el-col>
<el-col :span="24" > <el-col :span="24" >
<jnpf-form-tip-item label="是否启用" <jnpf-form-tip-item label="绑定商户"
prop="status" > prop="companyId" >
<p>{{dataForm.status}}</p> <p>{{dataForm.companyId}}</p>
</jnpf-form-tip-item> </jnpf-form-tip-item>
</el-col> </el-col>
<el-col :span="24" > <el-col :span="24" >
<jnpf-form-tip-item label="绑定商户" <jnpf-form-tip-item label="是否启用"
prop="companyId" tip-label="绑定商户" > prop="status" >
<p>{{dataForm.companyId}}</p> <p>{{dataForm.status}}</p>
</jnpf-form-tip-item> </jnpf-form-tip-item>
</el-col> </el-col>
<el-col :span="24" > <el-col :span="24" >
@ -86,8 +86,8 @@
id :'', id :'',
areaName : '', areaName : '',
areaType : "", areaType : "",
companyId : "543049974737277765",
status : "1", status : "1",
companyId : "",
areaMapInfo : "[{'lat':39.98423552382614,'lng':116.3059581286434},{'lat':39.986865947052266,'lng':116.3783954344508},{'lat':39.94897808062252,'lng':116.37942533460955},{'lat':39.94818852953558,'lng':116.3093911759388},{'lat':39.960820297511674,'lng':116.30801795711886}]", areaMapInfo : "[{'lat':39.98423552382614,'lng':116.3059581286434},{'lat':39.986865947052266,'lng':116.3783954344508},{'lat':39.94897808062252,'lng':116.37942533460955},{'lat':39.94818852953558,'lng':116.3093911759388},{'lat':39.960820297511674,'lng':116.30801795711886}]",
areaDesc : '', areaDesc : '',
creatorUserId : "", creatorUserId : "",

7
jnpf-java-boot/jnpf-web/src/views/stationarea/areaDialog.vue
Unescape View File

@ -256,6 +256,13 @@ export default {
*/ */
getAllPolygons(){ getAllPolygons(){
const _this = this; const _this = this;
request({
url: '/api/scm/StationArea/'+ id,
method: 'get'
}).then(res => {
this.dataInfo(res.data)
});
// axios.get(url.url + "/v1/polygons/findAll").then(function (response) { // axios.get(url.url + "/v1/polygons/findAll").then(function (response) {
// _this.polygonPath = response.data // _this.polygonPath = response.data
// _this.showArrayPolygon() // _this.showArrayPolygon()

2
jnpf-java-boot/jnpf-web/src/views/stationarea/columnList.js
View File

File diff suppressed because one or more lines are too long

21
jnpf-java-boot/jnpf-web/src/views/stationarea/form.vue
Unescape View File

@ -52,18 +52,18 @@
</el-col> </el-col>
<el-col :span="24" > <el-col :span="24" >
<jnpf-form-tip-item <jnpf-form-tip-item
label="是否启用" prop="status" > label="绑定商户" prop="companyId" >
<JnpfRadio v-model="dataForm.status" @change="changeData('status',-1)" <JnpfPopupSelect v-model="dataForm.companyId" @change="changeData('companyId',-1)"
optionType="default" direction="horizontal" size="small" :options="statusOptions" :props="statusProps" > :rowIndex="null" :formData="dataForm" :templateJson="interfaceRes.companyId" placeholder="请选择" hasPage propsValue="f_id" popupWidth="600px" popupTitle="选择商户" popupType="dialog" relationField='f_full_name' field='companyId' interfaceId="563326097714841605" :pageSize="20" :columnOptions="companyIdcolumnOptions" clearable :style='{"width":"100%"}'>
</JnpfRadio> </JnpfPopupSelect>
</jnpf-form-tip-item> </jnpf-form-tip-item>
</el-col> </el-col>
<el-col :span="24" > <el-col :span="24" >
<jnpf-form-tip-item <jnpf-form-tip-item
label="绑定商户" tipLabel="绑定商户" prop="companyId" > label="是否启用" prop="status" >
<JnpfOrganizeSelect v-model="dataForm.companyId" @change="changeData('companyId',-1)" <JnpfRadio v-model="dataForm.status" @change="changeData('status',-1)"
placeholder="请选择商户" selectType="custom" :ableIds="ableAll.companyIdableIds" clearable :style='{"width":"100%"}'> optionType="default" direction="horizontal" size="small" :options="statusOptions" :props="statusProps" >
</JnpfOrganizeSelect> </JnpfRadio>
</jnpf-form-tip-item> </jnpf-form-tip-item>
</el-col> </el-col>
<el-col :span="24" > <el-col :span="24" >
@ -155,8 +155,8 @@
dataForm: { dataForm: {
areaName : undefined, areaName : undefined,
areaType : undefined, areaType : undefined,
companyId : "543049974737277765",
status : "1", status : "1",
companyId : undefined,
areaMapInfo : "[{'lat':39.98423552382614,'lng':116.3059581286434},{'lat':39.986865947052266,'lng':116.3783954344508},{'lat':39.94897808062252,'lng':116.37942533460955},{'lat':39.94818852953558,'lng':116.3093911759388},{'lat':39.960820297511674,'lng':116.30801795711886}]", areaMapInfo : "[{'lat':39.98423552382614,'lng':116.3059581286434},{'lat':39.986865947052266,'lng':116.3783954344508},{'lat':39.94897808062252,'lng':116.37942533460955},{'lat':39.94818852953558,'lng':116.3093911759388},{'lat':39.960820297511674,'lng':116.30801795711886}]",
areaDesc : undefined, areaDesc : undefined,
creatorUserId : undefined, creatorUserId : undefined,
@ -206,6 +206,7 @@
}, },
areaTypeOptions:[], areaTypeOptions:[],
areaTypeProps:{"label":"fullName","value":"enCode" }, areaTypeProps:{"label":"fullName","value":"enCode" },
companyIdcolumnOptions:[ {"label":"商户名称","value":"f_full_name"},],
statusOptions:[], statusOptions:[],
statusProps:{"label":"fullName","value":"enCode" }, statusProps:{"label":"fullName","value":"enCode" },
childIndex:-1, childIndex:-1,
@ -213,8 +214,8 @@
interfaceRes: { interfaceRes: {
areaName:[] , areaName:[] ,
areaType:[] , areaType:[] ,
status:[] ,
companyId:[] , companyId:[] ,
status:[] ,
areaMapInfo:[] , areaMapInfo:[] ,
areaDesc:[] , areaDesc:[] ,
creatorUserId:[] , creatorUserId:[] ,

3
jnpf-java-boot/jnpf-web/src/views/stationarea/index.vue
Unescape View File

@ -35,7 +35,7 @@
<el-col :span="6"> <el-col :span="6">
<el-form-item label="绑定商户"> <el-form-item label="绑定商户">
<JnpfOrganizeSelect <JnpfOrganizeSelect
selectType="all" v-model="query.companyId" placeholder="请选择商户" clearable selectType="custom" :ableIds = '[["@currentOrgAndSubOrg"]]' v-model="query.companyId" placeholder="请选择商户" clearable
multiple /> multiple />
</el-form-item> </el-form-item>
</el-col> </el-col>
@ -232,6 +232,7 @@
statusOptions:[], statusOptions:[],
statusProps:{"label":"fullName","value":"enCode" }, statusProps:{"label":"fullName","value":"enCode" },
interfaceRes: { interfaceRes: {
companyId:[] ,
}, },
} }
}, },

2
jnpf-java-boot/jnpf-web/src/views/stationarea/superQueryJson.js
View File

File diff suppressed because one or more lines are too long
Write Preview
Loading…
Cancel
Save