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);
} }

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

File diff suppressed because it is too large Load Diff

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

9
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>
@ -71,8 +71,8 @@
</el-tooltip> </el-tooltip>
</div> </div>
</div> </div>
<JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' <JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange'
:span-method="arraySpanMethod" :span-method="arraySpanMethod"
> >
<el-table-column <el-table-column
@ -133,7 +133,7 @@
</el-button> </el-button>
<el-button type="text" class="JNPF-table-delBtn" v-has="'btn_remove'" @click="handleDel(scope.row.id)">删除 <el-button type="text" class="JNPF-table-delBtn" v-has="'btn_remove'" @click="handleDel(scope.row.id)">删除
</el-button> </el-button>
<el-button type="text" v-has="'btn_detail'" <el-button type="text" v-has="'btn_detail'"
@click="goDetail(scope.row.id)">详情 @click="goDetail(scope.row.id)">详情
</el-button> </el-button>
</template> </template>
@ -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