From ab890bca34582e2ec8e2d4b19798f067ea075b7a Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 28 四月 2025 10:30:47 +0800
Subject: [PATCH] 最新版本541200007
---
admin/src/api/business/member.js | 6 --
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/WmsServiceImpl.java | 1
server/system_gateway/src/main/resources/application-test.yml | 4 -
admin/src/views/vehicle/components/OperaCategoryWindow.vue | 13 ++++
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Category.java | 2
server/system_timer/src/main/java/com/doumee/jobs/fegin/VisitServiceFegin.java | 2
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformJobServiceImpl.java | 22 ++++++-
admin/src/views/vehicle/cars.vue | 8 +-
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarsServiceImpl.java | 16 ++--
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Cars.java | 2
server/system_timer/src/main/java/com/doumee/config/biz/VisitServiceJobBiz.java | 5 +
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java | 1
admin/src/components/business/OperaCarsWindow.vue | 50 +++++++---------
13 files changed, 72 insertions(+), 60 deletions(-)
diff --git a/admin/src/api/business/member.js b/admin/src/api/business/member.js
index b83f2b1..2b31162 100644
--- a/admin/src/api/business/member.js
+++ b/admin/src/api/business/member.js
@@ -33,7 +33,6 @@
download: true
})
}
-
// 鍒涘缓
export function create (data) {
return request.post('/visitsAdmin/cloudService/business/member/create', data)
@@ -41,7 +40,6 @@
export function memberList (data) {
return request.post('/visitsAdmin/cloudService/business/member/list', data)
}
-
// 淇敼
export function updateById (data) {
return request.post('/visitsAdmin/cloudService/business/member/updateById', data)
@@ -67,22 +65,18 @@
export function batchRoleAuth (data) {
return request.post('/visitsAdmin/cloudService/business/member/batchRoleAuth', data)
}
-
// 鎵归噺鎷夐粦
export function batchBlock (ids) {
return request.get(`/visitsAdmin/cloudService/business/member/batchBlock?ids=${ids}`)
}
-
// 閲嶆柊鎺堟潈
export function roleAuth (id) {
return request.get(`/visitsAdmin/cloudService/business/member/roleAuth/${id}`)
}
-
// 鍒犻櫎
export function deleteById (id) {
return request.get(`/visitsAdmin/cloudService/business/member/delete/${id}`)
}
-
// 鎵归噺鍒犻櫎
export function deleteByIdInBatch (ids) {
return request.get('/visitsAdmin/cloudService/business/member/delete/batch', {
diff --git a/admin/src/components/business/OperaCarsWindow.vue b/admin/src/components/business/OperaCarsWindow.vue
index 895ab6d..c278d1b 100644
--- a/admin/src/components/business/OperaCarsWindow.vue
+++ b/admin/src/components/business/OperaCarsWindow.vue
@@ -5,13 +5,13 @@
<el-form-item label="杞︾墝鍙�" prop="code">
<el-input v-model="form.code" placeholder="璇疯緭鍏ヨ溅鐗屽彿" v-trim />
</el-form-item>
- <el-form-item label="澶囨敞" prop="type">
+<!-- <el-form-item label="澶囨敞" prop="type">
<el-radio-group v-model="form.type">
<el-radio :label="0">瀹夋嘲鍏姟杞�</el-radio>
<el-radio :label="1">瀹夋嘲鐗╂祦杞�</el-radio>
<el-radio :label="2">鍏朵粬</el-radio>
</el-radio-group>
- </el-form-item>
+ </el-form-item>-->
<el-form-item label="閫夋嫨鍒嗙被锛�" prop="type">
<el-cascader v-model="form.cateId" @change="changeSel" :options="cateList" :props="{
label: 'name',
@@ -50,7 +50,7 @@
name: 'OperaInternalCompanyWindow',
extends: BaseOpera,
components: { GlobalWindow },
- data() {
+ data () {
return {
// 琛ㄥ崟鏁版嵁
memberList: [],
@@ -58,30 +58,30 @@
id: null,
code: null,
memberId: null,
- type: 0,
+ // type: 0,
groupId: null,
- cateId: [],
+ cateId: []
},
cateList: [],
companyList: [],
// 楠岃瘉瑙勫垯
rules: {
code: [{ required: true, message: '璇疯緭鍏ヨ溅鐗屽彿' }],
- groupId: [{ required: true, message: '璇烽�夋嫨缁勭粐' }],
- type: [
+ groupId: [{ required: true, message: '璇烽�夋嫨缁勭粐' }]
+ /* type: [
{ required: true, message: '璇烽�夋嫨澶囨敞' }
- ]
+ ] */
}
}
},
- created() {
+ created () {
this.config({
api: '/business/cars',
'field.id': 'id'
})
},
methods: {
- open(title, target) {
+ open (title, target) {
this.title = title
this.visible = true
this.getCate()
@@ -93,7 +93,6 @@
this.form[this.configData['field.id']] = null
this.form.type = 0
})
- return
}
// 缂栬緫
// this.$nextTick(() => {
@@ -102,14 +101,14 @@
// }
// })
},
- changeSel() {
+ changeSel () {
const { form } = this
if (form.groupId) {
this.loadMember()
}
this.form.memberId = ''
},
- confirm() {
+ confirm () {
console.log('form', this.form.cateId)
const { form } = this
if (form.cateId && form.cateId.length == 2) {
@@ -117,9 +116,9 @@
} else {
return Message.error('璇烽�夋嫨浜岀骇鍒嗙被')
}
- this.$refs['form'].validate((valid) => {
+ this.$refs.form.validate((valid) => {
if (valid) {
- let fn = form.id ? updateById : create
+ const fn = form.id ? updateById : create
fn({
...form,
cateId: form.cateId[1]
@@ -130,40 +129,37 @@
})
}
})
-
},
- close() {
+ close () {
this.visible = false
this.$emit('close')
},
- handleChange(val) {
+ handleChange (val) {
},
- getCate() {
+ getCate () {
fetchList({
model: {},
capacity: 1000,
- page: 1,
+ page: 1
}).then(res => {
this.cateList = res.records || []
-
})
},
- getCompany() {
+ getCompany () {
companyGetList({
- model: { },//鏈夊憳宸ョ殑鏁版嵁
+ model: { }, // 鏈夊憳宸ョ殑鏁版嵁
capacity: 10000,
- page: 1,
+ page: 1
}).then(res => {
this.companyList = res.records || []
-
})
},
- loadMember() {
+ loadMember () {
const { form } = this
allList({
type: 2,
- companyId: form.groupId,
+ companyId: form.groupId
})
.then(res => {
diff --git a/admin/src/views/vehicle/cars.vue b/admin/src/views/vehicle/cars.vue
index 08e133e..ba3dde6 100644
--- a/admin/src/views/vehicle/cars.vue
+++ b/admin/src/views/vehicle/cars.vue
@@ -29,13 +29,13 @@
<el-option label="鏈巿鏉�" value="0"></el-option>
</el-select>
</el-form-item>
- <el-form-item label="" prop="type" title="涓氬姟绫诲瀷">
+<!-- <el-form-item label="" prop="type" title="涓氬姟绫诲瀷">
<el-select v-model="searchForm.type" @change="search" clearable placeholder="澶囨敞">
<el-option label="瀹夋嘲鍏姟杞�" value="0"></el-option>
<el-option label="瀹夋嘲鑷湁鐗╂祦杞�" value="1"></el-option>
<el-option label="鍏朵粬" value="2"></el-option>
</el-select>
- </el-form-item>
+ </el-form-item>-->
<section>
<el-button type="primary" @click="search">鎼滅储</el-button>
<el-button @click="reset">閲嶇疆</el-button>
@@ -99,13 +99,13 @@
<div v-else>-</div>
</template>
</el-table-column>
- <el-table-column label="澶囨敞" min-width="120px">
+<!-- <el-table-column label="澶囨敞" min-width="120px">
<template slot-scope="{row}">
<span v-if="row.type == 0">瀹夋嘲鍏姟杞�</span>
<span v-if="row.type == 1">瀹夋嘲鑷湁鐗╂祦杞�</span>
<span v-if="row.type == 2">鍏朵粬</span>
</template>
- </el-table-column>
+ </el-table-column>-->
<el-table-column prop="editorName" label="鎿嶄綔浜�" min-width="100px"></el-table-column>
<el-table-column prop="editDate" label="鎿嶄綔鏃堕棿" min-width="140px"></el-table-column>
<el-table-column
diff --git a/admin/src/views/vehicle/components/OperaCategoryWindow.vue b/admin/src/views/vehicle/components/OperaCategoryWindow.vue
index cfcc402..f7220fb 100644
--- a/admin/src/views/vehicle/components/OperaCategoryWindow.vue
+++ b/admin/src/views/vehicle/components/OperaCategoryWindow.vue
@@ -9,6 +9,16 @@
<el-form-item label="鍒嗙被鍚嶇О" prop="name">
<el-input v-model="form.name" placeholder="璇疯緭鍏ュ垎绫诲悕绉�" v-trim />
</el-form-item>
+ <el-form-item label="涓氬姟绫诲瀷" prop="bizType">
+ <el-radio-group v-model="form.bizType">
+ <el-radio :label="0">璁垮杞﹁締</el-radio>
+ <el-radio :label="1">澶栧崗杩愯緭杞﹁締</el-radio>
+ <el-radio :label="2">甯傚叕鍙稿嵏璐ц溅杈�</el-radio>
+ <el-radio :label="3">鍔犲伐鐑熷嵏璐ц溅杈�</el-radio>
+ <el-radio :label="4">瀹夋嘲鐗╂祦鍏姟鐢ㄨ溅</el-radio>
+ <el-radio :label="5">瀹夋嘲鐗╂祦璐ц繍杞﹁締</el-radio>
+ </el-radio-group>
+ </el-form-item>
<!-- <el-form-item label="鐘舵��" prop="status">
<el-select v-model="form.status" placeholder="璇烽�夋嫨">
<el-option label="鍚敤" value="0"></el-option>
@@ -36,6 +46,7 @@
form: {
parentId: null,
name: '',
+ bizType,
remark: '',
status: '',
type: 1
@@ -62,7 +73,7 @@
getList() {
fetchCateList({}).then(res => {
this.dataList = res || []
-
+
})
},
close() {
diff --git a/server/system_gateway/src/main/resources/application-test.yml b/server/system_gateway/src/main/resources/application-test.yml
index b4f3356..0ffd791 100644
--- a/server/system_gateway/src/main/resources/application-test.yml
+++ b/server/system_gateway/src/main/resources/application-test.yml
@@ -6,8 +6,6 @@
password: rtjgfEr@&0c0m
driver-class-name: com.mysql.cj.jdbc.Driver
type: com.alibaba.druid.pool.DruidDataSource
-
-
#knife4j:
# enable: true
# basic:
@@ -16,9 +14,7 @@
# password: test@168.com
debug_model: true
-
captcha_check: false
-
# Swagger閰嶇疆
swagger:
host:
diff --git a/server/system_timer/src/main/java/com/doumee/config/biz/VisitServiceJobBiz.java b/server/system_timer/src/main/java/com/doumee/config/biz/VisitServiceJobBiz.java
index 479068f..a802b7f 100644
--- a/server/system_timer/src/main/java/com/doumee/config/biz/VisitServiceJobBiz.java
+++ b/server/system_timer/src/main/java/com/doumee/config/biz/VisitServiceJobBiz.java
@@ -22,13 +22,14 @@
@Override
public void run(String params,String module) {
Method method = null;
+ log.info("\n ======== 瀹氭椂浠诲姟鎵ц寮�濮嬶細visitServiceJob.========"+module);
try {
method = fegin.getClass().getDeclaredMethod(module);
method.invoke(fegin);
- log.info("\n ======== 瀹氭椂浠诲姟宸叉墽琛岋細visitServiceJob.========"+module);
+ log.info("\n ======== 瀹氭椂浠诲姟鎵ц瀹屾垚锛歷isitServiceJob.========"+module);
} catch (Exception e) {
e.printStackTrace();
+ log.info("\n ======== 瀹氭椂浠诲姟鎵ц寮傚父锛歷isitServiceJob.========"+module+"=="+e.getMessage());
}
-
}
}
diff --git a/server/system_timer/src/main/java/com/doumee/jobs/fegin/VisitServiceFegin.java b/server/system_timer/src/main/java/com/doumee/jobs/fegin/VisitServiceFegin.java
index 950454b..f7766bb 100644
--- a/server/system_timer/src/main/java/com/doumee/jobs/fegin/VisitServiceFegin.java
+++ b/server/system_timer/src/main/java/com/doumee/jobs/fegin/VisitServiceFegin.java
@@ -20,7 +20,7 @@
@GetMapping("/timer/empower/syncEmpowerResultData")
ApiResponse syncEmpowerResultData();
@ApiOperation("銆愯瀹㈢郴缁熴�戝畾鏃堕噸鏂颁笅鍙戝け璐ョ殑鎺堟潈鏁版嵁")
- @GetMapping("/timeempowerr//syncEmpowerFailData")
+ @GetMapping("/timeempowerr/syncEmpowerFailData")
ApiResponse syncEmpowerFailData();
@ApiOperation("銆愯瀹㈢郴缁熴�戝畾鏃跺埛鏂颁汉鍛樿澶囨巿鏉�")
@GetMapping("/timer/empower/syncEmpowerData")
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Cars.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Cars.java
index 6f1e0e7..39d0cfe 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Cars.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Cars.java
@@ -120,7 +120,7 @@
private Integer groupId;
@ApiModelProperty(value = "绫诲瀷 0瀹夋嘲鍏姟杞� 1瀹夋嘲鑷湁鐗╂祦杞� 2鍏跺畠", example = "1")
- @ExcelColumn(name="澶囨敞" ,index = 2,width = 8,valueMapping ="0=瀹夋嘲鍏姟杞�;1=瀹夋嘲鑷湁鐗╂祦杞�;2=鍏朵粬" )
+// @ExcelColumn(name="澶囨敞" ,index = 2,width = 8,valueMapping ="0=瀹夋嘲鍏姟杞�;1=瀹夋嘲鑷湁鐗╂祦杞�;2=鍏朵粬" )
private Integer type;
@ApiModelProperty(value = "鎵�灞炲垎绫荤紪鐮�", example = "1")
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Category.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Category.java
index 8821be2..4690f9e 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Category.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Category.java
@@ -71,6 +71,8 @@
@ApiModelProperty(value = "绫诲瀷 0鍏徃绫诲瀷 1杞﹁締绫诲瀷")
//@ExcelColumn(name="绫诲瀷 0鍏徃绫诲瀷 1杞﹁締绫诲瀷")
private Integer type;
+ @ApiModelProperty(value = "涓氬姟绫诲瀷 涓氬姟绫诲瀷 0=璁垮杞﹁締-璁垮杞﹁締 ;1=wms鎺ㄩ�佺殑鐗╂祦杞﹁締锛堥潪鑷湁杞︼級锛氳揣杩愯溅杈�-澶栧崗杩愯緭杞﹁締 ;2=wms甯傚叕鍙哥殑棰勭害鍏ュ洯杞﹁締锛氳揣杩愯溅杈�-甯傚叕鍙稿嵏璐ц溅杈�;3=wms銆佸畨娉扮殑棰勭害鍏ュ洯杞﹁締锛氳揣杩愯溅杈�-鍔犲伐鐑熷嵏璐ц溅杈� ;4=wms瀹夋嘲鍏姟杞︼細鍏姟杞�-瀹夋嘲鐗╂祦鍏姟鐢ㄨ溅;5=wms瀹夋嘲鑷湁杞︼細璐ц繍杞﹁締-瀹夋嘲鐗╂祦璐ц繍杞﹁締' ")
+ private Integer bizType;
@ApiModelProperty(value = "鐖剁骇缂栫爜锛堣嚜鍏宠仈锛�")
//@ExcelColumn(name="鐖剁骇缂栫爜锛堣嚜鍏宠仈锛�")
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarsServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarsServiceImpl.java
index e380400..5fed85e 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarsServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarsServiceImpl.java
@@ -72,14 +72,14 @@
if(loginUserInfo == null){
loginUserInfo = model.getLoginUserInfo();
}
- if(StringUtils.isBlank(model.getCode())
+ /* if(StringUtils.isBlank(model.getCode())
||model.getType()==null
||model.getCateId()==null
||model.getType()<0
||model.getType()>3
){
throw new BusinessException(ResponseStatus.BAD_REQUEST);
- }
+ }*/
if(model.getMemberId()!=null){
//妫�鏌ヨ溅涓讳俊鎭�
@@ -268,7 +268,7 @@
if(loginUserInfo == null){
loginUserInfo = model.getLoginUserInfo();
}
- if(StringUtils.isBlank(model.getCode())
+ /* if(StringUtils.isBlank(model.getCode())
||model.getId()==null
||model.getType()==null
||model.getCateId()==null
@@ -276,7 +276,7 @@
||model.getType()>3
){
throw new BusinessException(ResponseStatus.BAD_REQUEST);
- }
+ }*/
Cars car = carJoinMapper.selectById(model.getId());
if(car ==null ||Constants.equalsInteger(car.getIsdeleted(),Constants.ONE)){
throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"瀵逛笉璧凤紝杞﹁締淇℃伅涓嶅瓨鍦紒");
@@ -532,7 +532,7 @@
model.setPhone(ScientificNotationTUtil.convertToString(model.getPhone()));
if(StringUtils.isBlank(model.getCode())
&&StringUtils.isBlank(model.getCategoryName())
- &&StringUtils.isBlank(model.getType())
+// &&StringUtils.isBlank(model.getType())
&&StringUtils.isBlank(model.getSex())
&&StringUtils.isBlank(model.getIdcard())
&&StringUtils.isBlank(model.getParkName())
@@ -577,7 +577,7 @@
,List<Company> companyList
,List<Category> categoryList ) {
if(StringUtils.isBlank(model.getCode())
- ||StringUtils.isBlank(model.getType())
+// ||StringUtils.isBlank(model.getType())
||StringUtils.isBlank(model.getCategoryName())
||StringUtils.isBlank(model.getCompanyName())){
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝绗�"+(index+2)+"琛岃溅杈嗕俊鎭笉瀹屾暣锛岃妫�鏌ヨ〃鏍煎唴瀹癸紒");
@@ -605,14 +605,14 @@
cars.setIsnew(Constants.ZERO);
updateList.add(cars);
}
- //绫诲瀷 0瀹夋嘲鍏姟杞� 1瀹夋嘲鑷湁鐗╂祦杞� 2鍏跺畠
+ /* //绫诲瀷 0瀹夋嘲鍏姟杞� 1瀹夋嘲鑷湁鐗╂祦杞� 2鍏跺畠
if(StringUtils.equals(model.getType(),"瀹夋嘲鍏姟杞�")){
cars.setType(Constants.ZERO);
}else if(StringUtils.equals(model.getType(),"瀹夋嘲鑷湁鐗╂祦杞�")){
cars.setType(Constants.ONE);
}else{
cars.setType(Constants.TWO);
- }
+ }*/
cars.setCode(model.getCode());
Company company = findCompanyFromList(model.getCompanyName(),companyList);
if(company == null){
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformJobServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformJobServiceImpl.java
index c24a0b8..8dd4deb 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformJobServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformJobServiceImpl.java
@@ -737,7 +737,9 @@
PlatformGroup platformGroup = platformGroupMapper.selectById(groupId);
if(Objects.nonNull(platformGroup)&&StringUtils.isNotBlank(platformGroup.getUnFinishNoticeUsers())){
List<SystemUser> systemUserList = systemUserMapper.selectList(new QueryWrapper<SystemUser>().lambda()
- .eq(SystemUser::getDeleted,Constants.ZERO).eq(SystemUser::getStatus,Constants.ZERO).isNotNull(SystemUser::getOpenid)
+ .eq(SystemUser::getDeleted,Constants.ZERO)
+ .eq(SystemUser::getStatus,Constants.ZERO)
+ .isNotNull(SystemUser::getOpenid)
.in(SystemUser::getMemberId,Arrays.asList(platformGroup.getUnFinishNoticeUsers().split(",")))
);
if (com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(systemUserList)) {
@@ -753,11 +755,23 @@
}
}
}
-
-
-
}
+ public static void main(String[] args) {
+ Integer key1 =20;
+ Integer key2 =20;
+ Integer key3 =30;
+ Integer key4 =40;
+ List<Integer> list = new ArrayList<>();
+ list.add(key1);
+ list.add(key2);
+ list.add(key3);
+ list.add(key4);
+ Set<Integer> setList = new HashSet<>(list);
+ for (Integer groupId:setList) {
+ System.out.println(groupId);
+ }
+ }
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java
index 1c5cd60..42227d5 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java
@@ -312,7 +312,6 @@
return visits.getId();
}
-
@Override
@Transactional(rollbackFor = {BusinessException.class,Exception.class})
public Integer visitReporting(Visits visits) {
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/WmsServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/WmsServiceImpl.java
index 3883422..496c7f8 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/WmsServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/WmsServiceImpl.java
@@ -84,7 +84,6 @@
@Override
public WmsBaseResponse<WmsBaseDataResponse> orderPlatformBind(PlatformJob job) {
if(StringUtils.isBlank(job.getBillCode()) || StringUtils.isBlank(job.getPlatformWmsCode())){
-
return null;
}
int type = 0;
--
Gitblit v1.9.3