电子围栏0523

master
guochaojie 5 months ago
parent d71aa4575d
commit fcaaaa6fce

@ -2,9 +2,7 @@ package jnpf.service;
import jnpf.model.stationarea.*; import jnpf.model.stationarea.*;
import jnpf.entity.*; import jnpf.entity.*;
import java.util.*; 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 com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@ -13,12 +11,12 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
* 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);
@ -30,9 +28,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); List<StationAreaEntity> getOthersArea(String id);
} }

@ -1,31 +1,22 @@
package jnpf.service.impl; package jnpf.service.impl;
import com.alibaba.fastjson.JSONArray;
import jnpf.entity.*; import jnpf.entity.*;
import jnpf.mapper.StationAreaMapper; import jnpf.mapper.StationAreaMapper;
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.stationarea.*; import jnpf.model.stationarea.*;
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;
@ -34,25 +25,21 @@ 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;
/** /**
*
* *
* 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{
@Autowired @Autowired
private GeneraterSwapUtil generaterSwapUtil; private GeneraterSwapUtil generaterSwapUtil;
@ -60,314 +47,300 @@ public class StationAreaServiceImpl extends ServiceImpl<StationAreaMapper, Stati
private UserProvider userProvider; private UserProvider userProvider;
@Override @Override
public List<StationAreaEntity> getList(StationAreaPagination stationAreaPagination) { public List<StationAreaEntity> getList(StationAreaPagination stationAreaPagination){
return getTypeList(stationAreaPagination, stationAreaPagination.getDataType()); return getTypeList(stationAreaPagination,stationAreaPagination.getDataType());
} }
/** 列表查询 */
/**
*
*/
@Override @Override
public List<StationAreaEntity> getTypeList(StationAreaPagination stationAreaPagination, String dataType) { public List<StationAreaEntity> getTypeList(StationAreaPagination stationAreaPagination,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 ? StationAreaConstant.getAppColumnData() : StationAreaConstant.getColumnData(); String columnData = !isPc ? StationAreaConstant.getAppColumnData() : StationAreaConstant.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 stationAreaNum = 0; int stationAreaNum =0;
QueryWrapper<StationAreaEntity> stationAreaQueryWrapper = new QueryWrapper<>(); QueryWrapper<StationAreaEntity> stationAreaQueryWrapper=new QueryWrapper<>();
List<String> allSuperIDlist = new ArrayList<>(); List<String> allSuperIDlist = new ArrayList<>();
String superOp = ""; String superOp ="";
if (ObjectUtil.isNotEmpty(stationAreaPagination.getSuperQueryJson())) { if (ObjectUtil.isNotEmpty(stationAreaPagination.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 = stationAreaPagination.getSuperQueryJson(); String queryJson = stationAreaPagination.getSuperQueryJson();
SuperJsonModel superJsonModel = JsonUtil.getJsonToBean(queryJson, SuperJsonModel.class); SuperJsonModel superJsonModel = JsonUtil.getJsonToBean(queryJson, SuperJsonModel.class);
int superNum = 0; int superNum = 0;
QueryWrapper<StationAreaEntity> stationAreaSuperWrapper = new QueryWrapper<>(); 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(); int stationAreaNum1 = stationAreaSuperWrapper.getExpression().getNormal().size();
if (stationAreaNum1 > 0) { if (stationAreaNum1>0){
List<String> stationAreaList = this.list(stationAreaSuperWrapper).stream().map(StationAreaEntity::getId).collect(Collectors.toList()); List<String> stationAreaList =this.list(stationAreaSuperWrapper).stream().map(StationAreaEntity::getId).collect(Collectors.toList());
allSuperList.addAll(stationAreaList); allSuperList.addAll(stationAreaList);
intersectionSuperList.add(stationAreaList); intersectionSuperList.add(stationAreaList);
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<StationAreaEntity> stationAreaSuperWrapper = new QueryWrapper<>(); 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(); int stationAreaNum1 = stationAreaSuperWrapper.getExpression().getNormal().size();
if (stationAreaNum1 > 0) { if (stationAreaNum1>0){
List<String> stationAreaList = this.list(stationAreaSuperWrapper).stream().map(StationAreaEntity::getId).collect(Collectors.toList()); List<String> stationAreaList =this.list(stationAreaSuperWrapper).stream().map(StationAreaEntity::getId).collect(Collectors.toList());
allRuleList.addAll(stationAreaList); allRuleList.addAll(stationAreaList);
intersectionRuleList.add(stationAreaList); intersectionRuleList.add(stationAreaList);
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 = false; boolean pcPermission = false;
boolean appPermission = false; boolean appPermission = false;
if (isPc && pcPermission) { if(isPc && pcPermission){
if (!userProvider.get().getIsAdministrator()) { if (!userProvider.get().getIsAdministrator()){
Object stationAreaObj = generaterSwapUtil.getAuthorizeCondition(new QueryModel(stationAreaQueryWrapper, StationAreaEntity.class, stationAreaPagination.getMenuId(), "0")); Object stationAreaObj=generaterSwapUtil.getAuthorizeCondition(new QueryModel(stationAreaQueryWrapper,StationAreaEntity.class,stationAreaPagination.getMenuId(),"0"));
if (ObjectUtil.isEmpty(stationAreaObj)) { if (ObjectUtil.isEmpty(stationAreaObj)){
return new ArrayList<>(); return new ArrayList<>();
} else { } else {
stationAreaQueryWrapper = (QueryWrapper<StationAreaEntity>) stationAreaObj; stationAreaQueryWrapper = (QueryWrapper<StationAreaEntity>)stationAreaObj;
if (stationAreaQueryWrapper.getExpression().getNormal().size() > 0) { if( stationAreaQueryWrapper.getExpression().getNormal().size()>0){
stationAreaNum++; 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 && 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(isPc){
if (ObjectUtil.isNotEmpty(stationAreaPagination.getAreaName())) { if(ObjectUtil.isNotEmpty(stationAreaPagination.getAreaName())){
stationAreaNum++; stationAreaNum++;
String value = stationAreaPagination.getAreaName() instanceof List ? String value = stationAreaPagination.getAreaName() instanceof List ?
JsonUtil.getObjectToString(stationAreaPagination.getAreaName()) : JsonUtil.getObjectToString(stationAreaPagination.getAreaName()) :
String.valueOf(stationAreaPagination.getAreaName()); String.valueOf(stationAreaPagination.getAreaName());
stationAreaQueryWrapper.lambda().like(StationAreaEntity::getAreaName, value); stationAreaQueryWrapper.lambda().like(StationAreaEntity::getAreaName,value);
} }
if (ObjectUtil.isNotEmpty(stationAreaPagination.getAreaType())) { if(ObjectUtil.isNotEmpty(stationAreaPagination.getAreaType())){
stationAreaNum++; stationAreaNum++;
List<String> idList = new ArrayList<>(); List<String> idList = new ArrayList<>();
try { try {
String[][] areaType = JsonUtil.getJsonToBean(stationAreaPagination.getAreaType(), String[][].class); String[][] areaType = JsonUtil.getJsonToBean(stationAreaPagination.getAreaType(),String[][].class);
for (int i = 0; i < areaType.length; i++) { for(int i=0;i<areaType.length;i++){
if (areaType[i].length > 0) { if(areaType[i].length>0){
idList.add(JsonUtil.getObjectToString(Arrays.asList(areaType[i]))); idList.add(JsonUtil.getObjectToString(Arrays.asList(areaType[i])));
} }
} }
} catch (Exception e1) { }catch (Exception e1){
try { try {
List<String> areaType = JsonUtil.getJsonToList(stationAreaPagination.getAreaType(), String.class); List<String> areaType = JsonUtil.getJsonToList(stationAreaPagination.getAreaType(),String.class);
if (areaType.size() > 0) { if(areaType.size()>0){
idList.addAll(areaType); idList.addAll(areaType);
} }
} catch (Exception e2) { }catch (Exception e2){
idList.add(String.valueOf(stationAreaPagination.getAreaType())); idList.add(String.valueOf(stationAreaPagination.getAreaType()));
} }
} }
stationAreaQueryWrapper.lambda().and(t -> { stationAreaQueryWrapper.lambda().and(t->{
idList.forEach(tt -> { idList.forEach(tt->{
t.like(StationAreaEntity::getAreaType, tt).or(); t.like(StationAreaEntity::getAreaType, tt).or();
}); });
}); });
} }
if (ObjectUtil.isNotEmpty(stationAreaPagination.getStatus())) { if(ObjectUtil.isNotEmpty(stationAreaPagination.getStatus())){
stationAreaNum++; stationAreaNum++;
stationAreaQueryWrapper.lambda().eq(StationAreaEntity::getStatus, stationAreaPagination.getStatus()); stationAreaQueryWrapper.lambda().eq(StationAreaEntity::getStatus,stationAreaPagination.getStatus());
} }
if (ObjectUtil.isNotEmpty(stationAreaPagination.getCompanyId())) { if(ObjectUtil.isNotEmpty(stationAreaPagination.getCompanyId())){
stationAreaNum++; stationAreaNum++;
List<String> idList = new ArrayList<>(); List<String> idList = new ArrayList<>();
try { try {
String[][] companyId = JsonUtil.getJsonToBean(stationAreaPagination.getCompanyId(), String[][].class); String[][] companyId = JsonUtil.getJsonToBean(stationAreaPagination.getCompanyId(),String[][].class);
for (int i = 0; i < companyId.length; i++) { for(int i=0;i<companyId.length;i++){
if (companyId[i].length > 0) { if(companyId[i].length>0){
idList.add(JsonUtil.getObjectToString(Arrays.asList(companyId[i]))); idList.add(JsonUtil.getObjectToString(Arrays.asList(companyId[i])));
} }
} }
} catch (Exception e1) { }catch (Exception e1){
try { try {
List<String> companyId = JsonUtil.getJsonToList(stationAreaPagination.getCompanyId(), String.class); List<String> companyId = JsonUtil.getJsonToList(stationAreaPagination.getCompanyId(),String.class);
if (companyId.size() > 0) { if(companyId.size()>0){
idList.add(JsonUtil.getObjectToString(companyId)); idList.add(JsonUtil.getObjectToString(companyId));
} }
} catch (Exception e2) { }catch (Exception e2){
idList.add(String.valueOf(stationAreaPagination.getCompanyId())); idList.add(String.valueOf(stationAreaPagination.getCompanyId()));
} }
} }
stationAreaQueryWrapper.lambda().and(t -> { stationAreaQueryWrapper.lambda().and(t->{
idList.forEach(tt -> { idList.forEach(tt->{
t.like(StationAreaEntity::getCompanyId, tt).or(); t.like(StationAreaEntity::getCompanyId, tt).or();
}); });
}); });
} }
} }
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");
} }
stationAreaQueryWrapper.lambda().in(StationAreaEntity::getId, intersection); stationAreaQueryWrapper.lambda().in(StationAreaEntity::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;
stationAreaQueryWrapper.lambda().and(t -> t.in(StationAreaEntity::getId, finalAllSuperIDlist)); stationAreaQueryWrapper.lambda().and(t->t.in(StationAreaEntity::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;
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); stationAreaQueryWrapper.lambda().orderByDesc(StationAreaEntity::getId);
} else { }else{
try { try {
String sidx = stationAreaPagination.getSidx(); String sidx = stationAreaPagination.getSidx();
String[] strs = sidx.split("_name"); String[] strs= sidx.split("_name");
StationAreaEntity stationAreaEntity = new StationAreaEntity(); StationAreaEntity stationAreaEntity = new StationAreaEntity();
Field declaredField = stationAreaEntity.getClass().getDeclaredField(strs[0]); Field declaredField = stationAreaEntity.getClass().getDeclaredField(strs[0]);
declaredField.setAccessible(true); declaredField.setAccessible(true);
String value = declaredField.getAnnotation(TableField.class).value(); 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) { } 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<StationAreaEntity> page = new Page<>(stationAreaPagination.getCurrentPage(), stationAreaPagination.getPageSize()); Page<StationAreaEntity> page=new Page<>(stationAreaPagination.getCurrentPage(), stationAreaPagination.getPageSize());
IPage<StationAreaEntity> userIPage = this.page(page, stationAreaQueryWrapper); IPage<StationAreaEntity> userIPage=this.page(page, stationAreaQueryWrapper);
return stationAreaPagination.setData(userIPage.getRecords(), userIPage.getTotal()); return stationAreaPagination.setData(userIPage.getRecords(),userIPage.getTotal());
} else { }else{
List<StationAreaEntity> list = new ArrayList(); List<StationAreaEntity> list = new ArrayList();
return stationAreaPagination.setData(list, list.size()); return stationAreaPagination.setData(list, list.size());
} }
} else { }else{
return this.list(stationAreaQueryWrapper); return this.list(stationAreaQueryWrapper);
} }
} }
@Override @Override
public StationAreaEntity getInfo(String id) { public StationAreaEntity getInfo(String id){
QueryWrapper<StationAreaEntity> queryWrapper = new QueryWrapper<>(); QueryWrapper<StationAreaEntity> queryWrapper=new QueryWrapper<>();
queryWrapper.lambda().eq(StationAreaEntity::getId, id); queryWrapper.lambda().eq(StationAreaEntity::getId,id);
return this.getOne(queryWrapper); return this.getOne(queryWrapper);
} }
@Override @Override
public void create(StationAreaEntity entity) { public void create(StationAreaEntity entity){
this.save(entity); this.save(entity);
} }
@Override @Override
public boolean update(String id, StationAreaEntity entity) { public boolean update(String id, StationAreaEntity entity){
return this.updateById(entity); return this.updateById(entity);
} }
@Override @Override
public void delete(StationAreaEntity entity) { public void delete(StationAreaEntity entity){
if (entity != null) { if(entity!=null){
this.removeById(entity.getId()); this.removeById(entity.getId());
} }
} }
/** 验证表单唯一字段,正则,非空 i-0新增-1修改*/
/**
* i-0-1
*/
@Override @Override
public String checkForm(StationAreaForm form, int i) { public String checkForm(StationAreaForm 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.getAreaName())) { if(StringUtil.isEmpty(form.getAreaName())){
return "区域名称不能为空"; return "区域名称不能为空";
} }
if (StringUtil.isEmpty(form.getAreaMapInfo())) { if(StringUtil.isEmpty(form.getAreaMapInfo())){
return "地图信息不能为空"; return "地图信息不能为空";
} }
return countRecover; return countRecover;
} }
/** /**
* () * ()
* * @param id
* @param id * @param stationAreaForm
* @param stationAreaForm * @return
* @return */
*/
@Override @Override
@Transactional @Transactional
public void saveOrUpdate(StationAreaForm stationAreaForm, String id, boolean isSave) throws Exception { public void saveOrUpdate(StationAreaForm stationAreaForm,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());
stationAreaForm = JsonUtil.getJsonToBean( stationAreaForm = JsonUtil.getJsonToBean(
generaterSwapUtil.swapDatetime(StationAreaConstant.getFormData(), stationAreaForm), StationAreaForm.class); generaterSwapUtil.swapDatetime(StationAreaConstant.getFormData(),stationAreaForm),StationAreaForm.class);
StationAreaEntity entity = JsonUtil.getJsonToBean(stationAreaForm, StationAreaEntity.class); StationAreaEntity entity = JsonUtil.getJsonToBean(stationAreaForm, StationAreaEntity.class);
if (isSave) { if(isSave){
String mainId = RandomUtil.uuId(); String mainId = RandomUtil.uuId() ;
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("");
entity.setId(mainId); entity.setId(mainId);
} else { }else{
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(null); entity.setLastModifyUserId(null);
entity.setLastModifyTime(null); entity.setLastModifyTime(null);
entity.setCompanyId(generaterSwapUtil.getCurrentOrgIds(userInfo.getOrganizeId(), "company"));
} }
this.saveOrUpdate(entity); this.saveOrUpdate(entity);

@ -16,36 +16,31 @@ 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.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import javax.validation.Valid; import javax.validation.Valid;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.*; import java.util.*;
import jnpf.annotation.JnpfField; import jnpf.annotation.JnpfField;
import jnpf.base.vo.PageListVO; import jnpf.base.vo.PageListVO;
import jnpf.base.vo.PaginationVO; import jnpf.base.vo.PaginationVO;
import jnpf.base.vo.DownloadVO; import jnpf.base.vo.DownloadVO;
import jnpf.config.ConfigValueUtil; import jnpf.config.ConfigValueUtil;
import jnpf.base.entity.ProvinceEntity; import jnpf.base.entity.ProvinceEntity;
import java.io.IOException; import java.io.IOException;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import jnpf.engine.entity.FlowTaskEntity; import jnpf.engine.entity.FlowTaskEntity;
import jnpf.exception.WorkFlowException; import jnpf.exception.WorkFlowException;
import org.springframework.transaction.annotation.Transactional; 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
@Tag(name = "商户经营区域", description = "scm") @Tag(name = "商户经营区域" , description = "scm")
@RequestMapping("/api/scm/StationArea") @RequestMapping("/api/scm/StationArea")
public class StationAreaController { public class StationAreaController {
@ -63,25 +58,25 @@ public class StationAreaController {
/** /**
* *
* *
* @param stationAreaPagination * @param stationAreaPagination
* @return * @return
*/ */
@Operation(summary = "获取列表") @Operation(summary = "获取列表")
@PostMapping("/getList") @PostMapping("/getList")
public ActionResult list(@RequestBody StationAreaPagination stationAreaPagination) throws IOException { public ActionResult list(@RequestBody StationAreaPagination stationAreaPagination)throws IOException{
List<StationAreaEntity> list = stationAreaService.getList(stationAreaPagination); List<StationAreaEntity> list= stationAreaService.getList(stationAreaPagination);
List<Map<String, Object>> realList = new ArrayList<>(); List<Map<String, Object>> realList=new ArrayList<>();
for (StationAreaEntity entity : list) { for (StationAreaEntity entity : list) {
Map<String, Object> stationAreaMap = JsonUtil.entityToMap(entity); Map<String, Object> stationAreaMap=JsonUtil.entityToMap(entity);
stationAreaMap.put("id", stationAreaMap.get("id")); stationAreaMap.put("id", stationAreaMap.get("id"));
//副表数据 //副表数据
//子表数据 //子表数据
realList.add(stationAreaMap); realList.add(stationAreaMap);
} }
//数据转换 //数据转换
realList = generaterSwapUtil.swapDataList(realList, StationAreaConstant.getFormData(), StationAreaConstant.getColumnData(), stationAreaPagination.getModuleId(), false); realList = generaterSwapUtil.swapDataList(realList, StationAreaConstant.getFormData(), StationAreaConstant.getColumnData(), stationAreaPagination.getModuleId(),false);
//返回对象 //返回对象
PageListVO vo = new PageListVO(); PageListVO vo = new PageListVO();
@ -90,118 +85,109 @@ public class StationAreaController {
vo.setPagination(page); vo.setPagination(page);
return ActionResult.success(vo); return ActionResult.success(vo);
} }
/** /**
* *
* *
* @param stationAreaForm * @param stationAreaForm
* @return * @return
*/ */
@PostMapping() @PostMapping()
@Operation(summary = "创建") @Operation(summary = "创建")
public ActionResult create(@RequestBody @Valid StationAreaForm stationAreaForm) { public ActionResult create(@RequestBody @Valid StationAreaForm stationAreaForm) {
String b = stationAreaService.checkForm(stationAreaForm, 0); String b = stationAreaService.checkForm(stationAreaForm,0);
if (StringUtil.isNotEmpty(b)) { if (StringUtil.isNotEmpty(b)){
return ActionResult.fail(b); return ActionResult.fail(b );
} }
try { try{
stationAreaService.saveOrUpdate(stationAreaForm, null, true); stationAreaService.saveOrUpdate(stationAreaForm, null ,true);
} catch (Exception e) { }catch(Exception e){
return ActionResult.fail("新增数据失败"); return ActionResult.fail("新增数据失败");
} }
return ActionResult.success("创建成功"); return ActionResult.success("创建成功");
} }
/** /**
* *
* * @param id
* @param id * @param stationAreaForm
* @param stationAreaForm * @return
* @return */
*/
@PutMapping("/{id}") @PutMapping("/{id}")
@Operation(summary = "更新") @Operation(summary = "更新")
public ActionResult update(@PathVariable("id") String id, @RequestBody @Valid StationAreaForm stationAreaForm, public ActionResult update(@PathVariable("id") String id,@RequestBody @Valid StationAreaForm stationAreaForm,
@RequestParam(value = "isImport", required = false) boolean isImport) { @RequestParam(value = "isImport", required = false) boolean isImport){
stationAreaForm.setId(id); stationAreaForm.setId(id);
if (!isImport) { if (!isImport) {
String b = stationAreaService.checkForm(stationAreaForm, 1); String b = stationAreaService.checkForm(stationAreaForm,1);
if (StringUtil.isNotEmpty(b)) { if (StringUtil.isNotEmpty(b)){
return ActionResult.fail(b); return ActionResult.fail(b );
} }
} }
StationAreaEntity entity = stationAreaService.getInfo(id); StationAreaEntity entity= stationAreaService.getInfo(id);
if (entity != null) { if(entity!=null){
try { try{
stationAreaService.saveOrUpdate(stationAreaForm, id, false); stationAreaService.saveOrUpdate(stationAreaForm,id,false);
} catch (Exception e) { }catch(Exception e){
return ActionResult.fail("修改数据失败"); return ActionResult.fail("修改数据失败");
} }
return ActionResult.success("更新成功"); return ActionResult.success("更新成功");
} else { }else{
return ActionResult.fail("更新失败,数据不存在"); return ActionResult.fail("更新失败,数据不存在");
} }
} }
/** /**
* *
* * @param id
* @param id * @return
* @return */
*/
@Operation(summary = "删除") @Operation(summary = "删除")
@DeleteMapping("/{id}") @DeleteMapping("/{id}")
@Transactional @Transactional
public ActionResult delete(@PathVariable("id") String id) { public ActionResult delete(@PathVariable("id") String id){
StationAreaEntity entity = stationAreaService.getInfo(id); StationAreaEntity entity= stationAreaService.getInfo(id);
if (entity != null) { if(entity!=null){
//主表数据删除 //主表数据删除
stationAreaService.delete(entity); stationAreaService.delete(entity);
} }
return ActionResult.success("删除成功"); return ActionResult.success("删除成功");
} }
/** /**
* () * ()
* 使- * 使-
* * @param id
* @param id * @return
* @return */
*/
@Operation(summary = "表单信息(详情页)") @Operation(summary = "表单信息(详情页)")
@GetMapping("/detail/{id}") @GetMapping("/detail/{id}")
public ActionResult detailInfo(@PathVariable("id") String id) { public ActionResult detailInfo(@PathVariable("id") String id){
StationAreaEntity entity = stationAreaService.getInfo(id); StationAreaEntity entity= stationAreaService.getInfo(id);
if (entity == null) { if(entity==null){
return ActionResult.fail("表单数据不存在!"); return ActionResult.fail("表单数据不存在!");
} }
Map<String, Object> stationAreaMap = JsonUtil.entityToMap(entity); Map<String, Object> stationAreaMap=JsonUtil.entityToMap(entity);
stationAreaMap.put("id", stationAreaMap.get("id")); stationAreaMap.put("id", stationAreaMap.get("id"));
//副表数据 //副表数据
//子表数据 //子表数据
stationAreaMap = generaterSwapUtil.swapDataDetail(stationAreaMap, StationAreaConstant.getFormData(), "560427626187981125", false); stationAreaMap = generaterSwapUtil.swapDataDetail(stationAreaMap,StationAreaConstant.getFormData(),"560427626187981125",false);
return ActionResult.success(stationAreaMap); return ActionResult.success(stationAreaMap);
} }
/** /**
* () * ()
* 使- * 使-
* * @param id
* @param id * @return
* @return */
*/
@Operation(summary = "信息") @Operation(summary = "信息")
@GetMapping("/{id}") @GetMapping("/{id}")
public ActionResult info(@PathVariable("id") String id) { public ActionResult info(@PathVariable("id") String id){
StationAreaEntity entity = stationAreaService.getInfo(id); StationAreaEntity entity= stationAreaService.getInfo(id);
if (entity == null) { if(entity==null){
return ActionResult.fail("表单数据不存在!"); return ActionResult.fail("表单数据不存在!");
} }
Map<String, Object> stationAreaMap = JsonUtil.entityToMap(entity); Map<String, Object> stationAreaMap=JsonUtil.entityToMap(entity);
stationAreaMap.put("id", stationAreaMap.get("id")); stationAreaMap.put("id", stationAreaMap.get("id"));
//副表数据 //副表数据
//子表数据 //子表数据
stationAreaMap = generaterSwapUtil.swapDataForm(stationAreaMap, StationAreaConstant.getFormData(), StationAreaConstant.TABLEFIELDKEY, StationAreaConstant.TABLERENAMES); stationAreaMap = generaterSwapUtil.swapDataForm(stationAreaMap,StationAreaConstant.getFormData(),StationAreaConstant.TABLEFIELDKEY,StationAreaConstant.TABLERENAMES);
return ActionResult.success(stationAreaMap); return ActionResult.success(stationAreaMap);
} }

@ -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,26 +86,9 @@
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 : "[\n" +
" {\n" +
" \"lat\": 39.9629611771165,\n" +
" \"lng\": 116.30936980247498\n" +
" },\n" +
" {\n" +
" \"lat\": 39.96348746127829,\n" +
" \"lng\": 116.46523833274841\n" +
" },\n" +
" {\n" +
" \"lat\": 39.85815003104041,\n" +
" \"lng\": 116.4590585231781\n" +
" },\n" +
" {\n" +
" \"lat\": 39.85235177327065,\n" +
" \"lng\": 116.31966948509216\n" +
" }\n" +
"] \n",
areaDesc : '', areaDesc : '',
creatorUserId : "", creatorUserId : "",
creatorTime : "", creatorTime : "",

File diff suppressed because one or more lines are too long

@ -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:[] ,

@ -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:[] ,
}, },
} }
}, },

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