admin/.env.development
@@ -1,4 +1,5 @@ # 开发环境配置 NODE_ENV = 'development' VUE_APP_API_URL = 'http://192.168.0.173/admin_interface' VUE_APP_API_URL = 'http://localhost:10010' #VUE_APP_API_URL = 'http://192.168.0.173/admin_interface' server/system_gateway/src/main/resources/bootstrap-dev.yml
@@ -7,7 +7,7 @@ discovery: server-addr: http://175.27.187.84:8848 #配置Nacos地址 # namespace: dmvisit namespace: dev_renkang namespace: dmvisit username: nacos password: nacos gateway: server/system_service/pom.xml
@@ -18,7 +18,7 @@ <swagger.bootstrap-ui.version>1.9.6</swagger.bootstrap-ui.version> <fastjson.version>1.2.70</fastjson.version> <druid.version>1.2.0</druid.version> <mybatis.plus.version>3.4.2</mybatis.plus.version> <mybatis.plus.version>3.5.7</mybatis.plus.version> <apache.shiro.version>1.7.0</apache.shiro.version> <oshi.version>5.7.0</oshi.version> <jna.version>5.7.0</jna.version> @@ -68,27 +68,33 @@ <dependency> <groupId>com.github.pagehelper</groupId> <artifactId>pagehelper-spring-boot-starter</artifactId> <version>1.3.0</version> <!--使用spring boot2整合 pagehelper-spring-boot-starter必须排除一下依赖 因为pagehelper-spring-boot-starter也已经在pom依赖了mybatis与mybatis-spring 所以会与mybatis-plus-boot-starter中的mybatis与mybatis-spring发生冲突 --> <exclusions> <exclusion> <groupId>org.mybatis</groupId> <artifactId>mybatis</artifactId> </exclusion> <exclusion> <groupId>org.mybatis</groupId> <artifactId>mybatis-spring</artifactId> </exclusion> <!-- 解决jsqlparser 依赖版本冲突--> <exclusion> <artifactId>jsqlparser</artifactId> <groupId>com.github.jsqlparser</groupId> </exclusion> </exclusions> <version>2.1.0</version> </dependency> <!-- <dependency> <groupId>com.github.pagehelper</groupId> <artifactId>pagehelper-spring-boot-starter</artifactId> <version>1.3.0</version> <!–使用spring boot2整合 pagehelper-spring-boot-starter必须排除一下依赖 因为pagehelper-spring-boot-starter也已经在pom依赖了mybatis与mybatis-spring 所以会与mybatis-plus-boot-starter中的mybatis与mybatis-spring发生冲突 –> <exclusions> <exclusion> <groupId>org.mybatis</groupId> <artifactId>mybatis</artifactId> </exclusion> <exclusion> <groupId>org.mybatis</groupId> <artifactId>mybatis-spring</artifactId> </exclusion> <!– 解决jsqlparser 依赖版本冲突–> <!–<exclusion> <artifactId>jsqlparser</artifactId> <groupId>com.github.jsqlparser</groupId> </exclusion>–> </exclusions> </dependency>--> <!-- 连接池 --> <dependency> <groupId>com.alibaba</groupId> server/visits/dmvisit_admin/src/main/resources/bootstrap-dev.yml
@@ -24,7 +24,7 @@ discovery: server-addr: http://175.27.187.84:8848 #配置Nacos地址 # namespace: dmvisit namespace: dev_renkang namespace: dmvisit username: nacos password: nacos # swagger配置 server/visits/dmvisit_service/src/main/java/com/doumee/dao/admin/response/StagingDataVO.java
@@ -27,16 +27,16 @@ private Long lwCount; @ApiModelProperty(value = "在场车辆") private Integer presenceCarCount; private Long presenceCarCount; @ApiModelProperty(value = "预约车辆") private Integer visitorCarCount; private Long visitorCarCount; @ApiModelProperty(value = "长期车辆") private Integer longCarCount; private Long longCarCount; @ApiModelProperty(value = "供应商数量") private Integer supplierCount; private Long supplierCount; @ApiModelProperty(value = "劳务公司人员数") private List<Map<String,Object>> companyUsers; server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Member.java
@@ -236,11 +236,9 @@ @ApiModelProperty(value = "角色编码查询") @TableField(exist = false) private String roleIdParam; @ApiModelProperty(value = "前缀地址") @TableField(exist = false) private String prefixUrl; @ApiModelProperty(value = "授权门禁组编码集合,【访客端】唯一标识",hidden = true ) @TableField(exist = false) private Integer[] roleIds; @@ -250,37 +248,28 @@ @ApiModelProperty(value = "有效期类型 0长期有效 1自定义",hidden = true ) @TableField(exist = false) private Integer timeType; //暂无使用 @ApiModelProperty(value = "姓名/手机号/工号") @TableField(exist = false) private String keyword; @ApiModelProperty(value = "是否有人脸：0=无；1=有；") @TableField(exist = false) private Integer isFace; @ApiModelProperty(value = "访问次数") @TableField(exist = false) private Integer visitTimes; @ApiModelProperty(value = "最后访问时间") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date lastVisitDate; @ApiModelProperty(value = "门禁有效期开始") @ExcelColumn(name="门禁有效期开始",index= 5,dateFormat = "yyyy-MM-dd") private Date startTime; @ApiModelProperty(value = "编码集合") @TableField(exist = false) private List<Integer> idList; @ApiModelProperty(value = "门禁有效期结束", example = "1") @ExcelColumn(name="门禁有效期结束",index= 6,dateFormat = "yyyy-MM-dd") private Date endTime; @ApiModelProperty(value = "人脸照片完整地址") @TableField(exist = false) private String faceImgFull; @@ -300,7 +289,6 @@ @ApiModelProperty(value = "培训结束时间") @TableField(exist = false) private Date trainEndTime; @ApiModelProperty(value = "门禁组名称集合") @TableField(exist = false) private List<String> roleNames; server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/response/InternalHomeVO.java
@@ -20,7 +20,7 @@ private Long noticeDealNum; @ApiModelProperty(value = "我发起的待办数量") private Integer noticeCreateNum; private Long noticeCreateNum; @ApiModelProperty(value = "抄送的待办数量") private Long noticeCopyNum; server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ApproveServiceImpl.java
@@ -1,7 +1,6 @@ package com.doumee.service.business.impl; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.extension.api.R; import com.doumee.biz.system.SystemDictDataBiz; import com.doumee.core.constants.ResponseStatus; import com.doumee.core.exception.BusinessException; server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java
@@ -576,7 +576,7 @@ queryWrapper.leftJoin(SystemUser.class,SystemUser::getId,Company::getEditor); queryWrapper.eq(Company::getIsdeleted,Constants.ZERO); queryWrapper.eq(type!=null,Company::getType,type); queryWrapper.orderByAsc(Company::getSortnum ); queryWrapper.orderByAsc(true,"t.sortnum"); List<Company> companyList = companyJoinMapper.selectJoinList(Company.class,queryWrapper); //配置组员人员类型来源方式 0自建 1ERP CompanyTree treeBuild = new CompanyTree(companyList, dataSyncConfig.getOrgUserDataOrigin()); @@ -618,7 +618,8 @@ if (currentMenuIndex - 1 < 0) { return; } Company preMenu = companyPool.remove(currentMenuIndex - 1); Company preMenu = companyPool.get(currentMenuIndex - 1); companyPool.remove(currentMenuIndex - 1); companyPool.add(currentMenuIndex, preMenu); } // 下移 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/erp/ErpSyncServiceImpl.java
@@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.api.R; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.doumee.biz.system.SystemDictDataBiz; import com.doumee.config.DataSyncConfig;
