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

电子围栏0523

Browse Source
master
guochaojie 5 months ago
parent d71aa4575d
commit fcaaaa6fce
9 changed files with 285 additions and 343 deletions
Show Stats Download Patch File Download Diff File

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

@ -2,9 +2,7 @@ package jnpf.service;
import jnpf.model.stationarea.*;
import jnpf.entity.*;
import java.util.*;
import com.baomidou.mybatisplus.extension.service.IService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@ -13,7 +11,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
* 版本： V3.5
* 版权： 引迈信息技术有限公司（https://www.jnpfsoft.com）
* 作者： JNPF开发平台组
* 日期： 2024-05-21
* 日期： 2024-05-23
*/
public interface StationAreaService extends IService<StationAreaEntity> {
List<StationAreaEntity> getList(StationAreaPagination stationAreaPagination);

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

@ -1,31 +1,22 @@
package jnpf.service.impl;
import com.alibaba.fastjson.JSONArray;
import jnpf.entity.*;
import jnpf.mapper.StationAreaMapper;
import jnpf.service.*;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import jnpf.model.stationarea.*;
import java.math.BigDecimal;
import cn.hutool.core.util.ObjectUtil;
import jnpf.permission.model.authorize.AuthorizeConditionModel;
import jnpf.util.GeneraterSwapUtil;
import jnpf.database.model.superQuery.SuperQueryJsonModel;
import jnpf.database.model.superQuery.ConditionJsonModel;
import jnpf.database.model.superQuery.SuperQueryConditionModel;
import java.lang.reflect.Field;
import com.baomidou.mybatisplus.annotation.TableField;
import java.util.regex.Pattern;
import jnpf.model.QueryModel;
import java.util.stream.Collectors;
import jnpf.base.model.ColumnDataModel;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.core.metadata.IPage;
@ -34,22 +25,18 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import java.text.SimpleDateFormat;
import jnpf.util.*;
import java.util.*;
import jnpf.base.UserInfo;
import jnpf.permission.entity.UserEntity;
/**
*
* 商户经营区域
* 版本： V3.5
* 版权： 引迈信息技术有限公司（https://www.jnpfsoft.com）
* 作者： JNPF开发平台组
* 日期： 2024-05-21
* 日期： 2024-05-23
*/
@Service
public class StationAreaServiceImpl extends ServiceImpl<StationAreaMapper, StationAreaEntity> implements StationAreaService{
@ -63,10 +50,7 @@ public class StationAreaServiceImpl extends ServiceImpl<StationAreaMapper, Stati
public List<StationAreaEntity> getList(StationAreaPagination stationAreaPagination){
return getTypeList(stationAreaPagination,stationAreaPagination.getDataType());
}
/**
* 列表查询
*/
/** 列表查询 */
@Override
public List<StationAreaEntity> getTypeList(StationAreaPagination stationAreaPagination,String dataType){
String userId=userProvider.get().getUserId();
@ -290,34 +274,27 @@ public class StationAreaServiceImpl extends ServiceImpl<StationAreaMapper, Stati
return this.list(stationAreaQueryWrapper);
}
}
@Override
public StationAreaEntity getInfo(String id){
QueryWrapper<StationAreaEntity> queryWrapper=new QueryWrapper<>();
queryWrapper.lambda().eq(StationAreaEntity::getId,id);
return this.getOne(queryWrapper);
}
@Override
public void create(StationAreaEntity entity){
this.save(entity);
}
@Override
public boolean update(String id, StationAreaEntity entity){
return this.updateById(entity);
}
@Override
public void delete(StationAreaEntity entity){
if(entity!=null){
this.removeById(entity.getId());
}
}
/**
* 验证表单唯一字段，正则，非空 i-0新增-1修改
*/
/** 验证表单唯一字段，正则，非空 i-0新增-1修改*/
@Override
public String checkForm(StationAreaForm form,int i) {
boolean isUp =StringUtil.isNotEmpty(form.getId()) && !form.getId().equals("0");
@ -335,10 +312,8 @@ public class StationAreaServiceImpl extends ServiceImpl<StationAreaMapper, Stati
}
return countRecover;
}
/**
* 新增修改数据(事务回滚)
*
* @param id
* @param stationAreaForm
* @return
@ -357,9 +332,8 @@ public class StationAreaServiceImpl extends ServiceImpl<StationAreaMapper, Stati
entity.setCreatorUserId(userInfo.getUserId());
entity.setCreatorTime(DateUtil.getNowDate());
entity.setOrganizeJsonId(generaterSwapUtil.getCurrentOrgIds(userInfo.getOrganizeId(),"all"));
entity.setLastModifyUserId(userInfo.getUserId());
entity.setLastModifyTime(DateUtil.getNowDate());
entity.setCompanyId("");
entity.setLastModifyUserId(null);
entity.setLastModifyTime(null);
entity.setId(mainId);
}else{
entity.setCreatorUserId(userInfo.getUserId());
@ -367,7 +341,6 @@ public class StationAreaServiceImpl extends ServiceImpl<StationAreaMapper, Stati
entity.setOrganizeJsonId(generaterSwapUtil.getCurrentOrgIds(userInfo.getOrganizeId(),"all"));
entity.setLastModifyUserId(null);
entity.setLastModifyTime(null);
entity.setCompanyId(generaterSwapUtil.getCurrentOrgIds(userInfo.getOrganizeId(), "company"));
}
this.saveOrUpdate(entity);

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

@ -16,32 +16,27 @@ import jnpf.utils.AreaUtil;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import javax.validation.Valid;
import java.math.BigDecimal;
import java.util.*;
import jnpf.annotation.JnpfField;
import jnpf.base.vo.PageListVO;
import jnpf.base.vo.PaginationVO;
import jnpf.base.vo.DownloadVO;
import jnpf.config.ConfigValueUtil;
import jnpf.base.entity.ProvinceEntity;
import java.io.IOException;
import java.util.stream.Collectors;
import jnpf.engine.entity.FlowTaskEntity;
import jnpf.exception.WorkFlowException;
import org.springframework.transaction.annotation.Transactional;
/**
* 商户经营区域
*
* @版本： V3.5
* @版权： 引迈信息技术有限公司（https://www.jnpfsoft.com）
* @作者： JNPF开发平台组
* @日期： 2024-05-21
* @日期： 2024-05-23
*/
@Slf4j
@RestController
@ -90,7 +85,6 @@ public class StationAreaController {
vo.setPagination(page);
return ActionResult.success(vo);
}
/**
* 创建
*
@ -111,10 +105,8 @@ public class StationAreaController {
}
return ActionResult.success("创建成功");
}
/**
* 编辑
*
* @param id
* @param stationAreaForm
* @return
@ -142,10 +134,8 @@ public class StationAreaController {
return ActionResult.fail("更新失败，数据不存在");
}
}
/**
* 删除
*
* @param id
* @return
*/
@ -160,11 +150,9 @@ public class StationAreaController {
}
return ActionResult.success("删除成功");
}
/**
* 表单信息(详情页)
* 详情页面使用-转换数据
*
* @param id
* @return
*/
@ -182,11 +170,9 @@ public class StationAreaController {
stationAreaMap = generaterSwapUtil.swapDataDetail(stationAreaMap,StationAreaConstant.getFormData(),"560427626187981125",false);
return ActionResult.success(stationAreaMap);
}
/**
* 获取详情(编辑页)
* 编辑页面使用-不转换数据
*
* @param id
* @return
*/

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

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

@ -25,15 +25,15 @@
</jnpf-form-tip-item>
</el-col>
<el-col :span="24" >
<jnpf-form-tip-item label="是否启用"
prop="status" >
<p>{{dataForm.status}}</p>
<jnpf-form-tip-item label="绑定商户"
prop="companyId" >
<p>{{dataForm.companyId}}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="24" >
<jnpf-form-tip-item label="绑定商户"
prop="companyId" tip-label="绑定商户" >
<p>{{dataForm.companyId}}</p>
<jnpf-form-tip-item label="是否启用"
prop="status" >
<p>{{dataForm.status}}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="24" >
@ -86,26 +86,9 @@
id :'',
areaName : '',
areaType : "",
companyId : "543049974737277765",
status : "1",
companyId : "",
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",
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 : '',
creatorUserId : "",
creatorTime : "",

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 :span="24" >
<jnpf-form-tip-item
label="是否启用" prop="status" >
<JnpfRadio v-model="dataForm.status" @change="changeData('status',-1)"
optionType="default" direction="horizontal" size="small" :options="statusOptions" :props="statusProps" >
</JnpfRadio>
label="绑定商户" prop="companyId" >
<JnpfPopupSelect v-model="dataForm.companyId" @change="changeData('companyId',-1)"
: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%"}'>
</JnpfPopupSelect>
</jnpf-form-tip-item>
</el-col>
<el-col :span="24" >
<jnpf-form-tip-item
label="绑定商户" tipLabel="绑定商户" prop="companyId" >
<JnpfOrganizeSelect v-model="dataForm.companyId" @change="changeData('companyId',-1)"
placeholder="请选择商户" selectType="custom" :ableIds="ableAll.companyIdableIds" clearable :style='{"width":"100%"}'>
</JnpfOrganizeSelect>
label="是否启用" prop="status" >
<JnpfRadio v-model="dataForm.status" @change="changeData('status',-1)"
optionType="default" direction="horizontal" size="small" :options="statusOptions" :props="statusProps" >
</JnpfRadio>
</jnpf-form-tip-item>
</el-col>
<el-col :span="24" >
@ -155,8 +155,8 @@
dataForm: {
areaName : undefined,
areaType : undefined,
companyId : "543049974737277765",
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}]",
areaDesc : undefined,
creatorUserId : undefined,
@ -206,6 +206,7 @@
},
areaTypeOptions:[],
areaTypeProps:{"label":"fullName","value":"enCode" },
companyIdcolumnOptions:[ {"label":"商户名称","value":"f_full_name"},],
statusOptions:[],
statusProps:{"label":"fullName","value":"enCode" },
childIndex:-1,
@ -213,8 +214,8 @@
interfaceRes: {
areaName:[] ,
areaType:[] ,
status:[] ,
companyId:[] ,
status:[] ,
areaMapInfo:[] ,
areaDesc:[] ,
creatorUserId:[] ,

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

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