最新版本541200007

jiangping

2025-04-28 ab890bca34582e2ec8e2d4b19798f067ea075b7a

最新版本541200007

 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', {

 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 => {

 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

 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() {

 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:

 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 ======== 定时任务执行完成：visitServiceJob.========"+module);
        } catch (Exception e) {
           e.printStackTrace();
            log.info("\n ======== 定时任务执行异常：visitServiceJob.========"+module+"=="+e.getMessage());
        }

    }
}

 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")

 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")

 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="父级编码（自关联）")

 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){

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




 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) {

 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;