diff --git a/src/main/java/com/zhgd/xmgl/base/UploadFileDTO.java b/src/main/java/com/zhgd/xmgl/base/UploadFileDTO.java index 2423f31df..57a905bde 100644 --- a/src/main/java/com/zhgd/xmgl/base/UploadFileDTO.java +++ b/src/main/java/com/zhgd/xmgl/base/UploadFileDTO.java @@ -1,12 +1,13 @@ package com.zhgd.xmgl.base; +import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; - @Data +@ApiModel(value = "上传文件") public class UploadFileDTO { @ApiModelProperty(value = "文件路径") diff --git a/src/main/java/com/zhgd/xmgl/modules/project/service/impl/ProjectServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/project/service/impl/ProjectServiceImpl.java index ceb4ebb9d..ef88381e0 100644 --- a/src/main/java/com/zhgd/xmgl/modules/project/service/impl/ProjectServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/project/service/impl/ProjectServiceImpl.java @@ -23,6 +23,8 @@ import com.zhgd.xmgl.modules.bigdevice.entity.Tower; import com.zhgd.xmgl.modules.bigdevice.service.IGantryCraneService; import com.zhgd.xmgl.modules.bigdevice.service.ILifterService; import com.zhgd.xmgl.modules.bigdevice.service.ITowerService; +import com.zhgd.xmgl.modules.bimface.entity.BimfaceConfig; +import com.zhgd.xmgl.modules.bimface.mapper.BimfaceConfigMapper; import com.zhgd.xmgl.modules.car.entity.CarCamera; import com.zhgd.xmgl.modules.car.mapper.CarCameraMapper; import com.zhgd.xmgl.modules.car.service.ICarInfoService; @@ -76,6 +78,8 @@ import java.util.stream.Collectors; @Service @Transactional(rollbackFor = Exception.class) public class ProjectServiceImpl extends ServiceImpl implements IProjectService { + @Autowired + private BimfaceConfigMapper bimfaceConfigMapper; @Autowired private SystemProvincesServiceImpl systemProvincesService; @Autowired @@ -208,6 +212,9 @@ public class ProjectServiceImpl extends ServiceImpl impl ProjectConfig config = new ProjectConfig(); config.setProjectSn(project.getProjectSn()); projectConfigMapper.insert(config); + BimfaceConfig bimfaceConfig = new BimfaceConfig(); + bimfaceConfig.setProjectSn(project.getProjectSn()); + bimfaceConfigMapper.insert(bimfaceConfig); } /** diff --git a/src/main/java/com/zhgd/xmgl/modules/weight/entity/WeighBookVehicleInfo.java b/src/main/java/com/zhgd/xmgl/modules/weight/entity/WeighBookVehicleInfo.java index 2de9dab91..f9a31c088 100644 --- a/src/main/java/com/zhgd/xmgl/modules/weight/entity/WeighBookVehicleInfo.java +++ b/src/main/java/com/zhgd/xmgl/modules/weight/entity/WeighBookVehicleInfo.java @@ -109,10 +109,5 @@ public class WeighBookVehicleInfo implements Serializable { */ @TableField(exist = false) private String lastPullTime; - /** - * 上次查询的id(查询这个id数据之后的数据(不返回这条id数据)) - */ - @TableField(exist = false) - private Long lastQueryId; } diff --git a/src/main/java/com/zhgd/xmgl/modules/weight/service/impl/WeighBookVehicleInfoServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/weight/service/impl/WeighBookVehicleInfoServiceImpl.java index 71b581924..07ff79e93 100644 --- a/src/main/java/com/zhgd/xmgl/modules/weight/service/impl/WeighBookVehicleInfoServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/weight/service/impl/WeighBookVehicleInfoServiceImpl.java @@ -35,14 +35,12 @@ public class WeighBookVehicleInfoServiceImpl extends ServiceImpl> result = new Result>(); LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper() .eq(StringUtils.isNotBlank(projectSn), WeighBookVehicleInfo::getProjectSn, projectSn) .like(StringUtils.isNotBlank(weighBookVehicleInfo.getSpecifications()), WeighBookVehicleInfo::getSpecifications, weighBookVehicleInfo.getSpecifications()) .like(StringUtils.isNotBlank(weighBookVehicleInfo.getGoodsName()), WeighBookVehicleInfo::getGoodsName, weighBookVehicleInfo.getGoodsName()) - .like(StringUtils.isNotBlank(weighBookVehicleInfo.getLicensePlate()), WeighBookVehicleInfo::getLicensePlate, weighBookVehicleInfo.getLicensePlate()) - .gt(lastQueryId != null, WeighBookVehicleInfo::getId, lastQueryId); + .like(StringUtils.isNotBlank(weighBookVehicleInfo.getLicensePlate()), WeighBookVehicleInfo::getLicensePlate, weighBookVehicleInfo.getLicensePlate()); IPage pageList; Page page = new Page(pageNo, pageSize); if (StringUtils.isNotBlank(lastPullTime)) { diff --git a/src/main/resources/application-other-env-show.properties b/src/main/resources/application-other-env-show.properties index 51e9b06ce..a8f8cddbe 100644 --- a/src/main/resources/application-other-env-show.properties +++ b/src/main/resources/application-other-env-show.properties @@ -1,57 +1,55 @@ -http.port=30260 -#http.port=6023 +#http.port=30250 +http.port=21323 +#spring.datasource.url=jdbc:mysql://124.71.178.44:3306/wisdomsite_lgdc?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&autoReconnect=true #spring.datasource.url=jdbc:mysql://183.60.227.61:20246/wisdomsite?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&autoReconnect=true&serverTimezone=UTC spring.datasource.url=jdbc:mysql://139.9.66.234:33306/wisdomsite_other_env_show?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&autoReconnect=true #spring.datasource.url=jdbc:mysql://127.0.0.1:20246/wisdomsite?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&autoReconnect=true spring.datasource.username=ENC(XR4C/hvTYCUqudS49Wh/jA==) spring.datasource.password=ENC(hHkiHEc6vSWjqfOtg2/2Uiihs0vX3l7V) -server.port=12643 +server.port=11120 #server.port=30246 -basePath=F:/zhgd/itbgpImage/ -server.tomcat.basedir=F:/zhgd/tempImage/ -arcsoft.dllPath=F:/zhgd/dll +basePath=C:/jxj/prod/backEnd/itbgpImage/ +server.tomcat.basedir=C:/jxj/prod/backEnd/tempImage/ +#arcsoft.dllPath=D:/hz/wisdomSite/src/main/resources/dll #basePath=F:/zhgd/itbgpImage/ #server.tomcat.basedir=F:/zhgd/tempImage/ #arcsoft.dllPath=F:/zhgd/dll -security.enable=true +arcsoft.dllPath=C:/jxj/prod/backEnd/dll +security.enable=false isGetStandardData=false isGetEnvironmentData=false isGetFaceFeatureDate=false -#海康视频报警图片IP端口替换 +#\u6D77\u5EB7\u89C6\u9891\u62A5\u8B66\u56FE\u7247IP\u7AEF\u53E3\u66FF\u6362 video.alarm.newUrl=223.82.100.80:6040 wx-appid= wx-AppSecret= -mqtt-scope=devTopic -serverUrl=http://124.71.178.44:30249 +mqtt-scope=zjsjTopic +serverUrl=http://124.71.67.160:8088/ +#serverUrl=http://182.90.224.237:7000 #serverUrl=http://127.0.0.1:6023 -#视频分析url +#\u89C6\u9891\u5206\u6790url video-analysis-url= -#客户端 License相关配置 -license.licensePath=E:/license/license.lic -license.publicKeysStorePath=E:/license/publicCerts.keystore -#文件上传 -zhgd.file-storage.type=local -#文件存储配置 -#默认使用的存储平台 -spring.file-storage.default-platform=local -#".min.jpg" #缩略图后缀,例如【.min.jpg】【.png】 -spring.file-storage.thumbnail-suffix=.jpg -# 本地存储,不使用的情况下可以不写 -# 存储平台标识 -spring.file-storage.local[0].platform=local -#启用存储 -spring.file-storage.local[0].enable-storage=true -#启用访问(线上请使用 Nginx 配置,效率更高) -spring.file-storage.local[0].enable-access=false -# 访问域名,例如:“http://127.0.0.1:6023/image/”,注意后面要和 path-patterns 保持一致,“/”结尾,本地存储建议使用相对路径,方便后期更换域名 -spring.file-storage.local[0].domain= -# 存储地址 -spring.file-storage.local[0].base-path=F:/zhgd/itbgpImage/ -# 访问路径,开启 enable-access 后,通过此路径可以访问到上传的文件 -spring.file-storage.local[0].path-patterns= server.ssl.enabled=false #\u9ED8\u8BA4\u653F\u52A1\u521B\u5EFA\u9879\u76EE\u6240\u5C5E\u4F01\u4E1A defaultZwComapnySn= +#\u6587\u4EF6\u5B58\u50A8\u914D\u7F6E +#\u9ED8\u8BA4\u4F7F\u7528\u7684\u5B58\u50A8\u5E73\u53F0 +spring.file-storage.default-platform=local +#".min.jpg" #\u7F29\u7565\u56FE\u540E\u7F00\uFF0C\u4F8B\u5982\u3010.min.jpg\u3011\u3010.png\u3011 +spring.file-storage.thumbnail-suffix=.jpg +# \u672C\u5730\u5B58\u50A8\uFF0C\u4E0D\u4F7F\u7528\u7684\u60C5\u51B5\u4E0B\u53EF\u4EE5\u4E0D\u5199 +# \u5B58\u50A8\u5E73\u53F0\u6807\u8BC6 +spring.file-storage.local[0].platform=local +#\u542F\u7528\u5B58\u50A8 +spring.file-storage.local[0].enable-storage=true +#\u542F\u7528\u8BBF\u95EE\uFF08\u7EBF\u4E0A\u8BF7\u4F7F\u7528 Nginx \u914D\u7F6E\uFF0C\u6548\u7387\u66F4\u9AD8\uFF09 +spring.file-storage.local[0].enable-access=false +# \u8BBF\u95EE\u57DF\u540D\uFF0C\u4F8B\u5982\uFF1A\u201Chttp://127.0.0.1:6023/image/\u201D\uFF0C\u6CE8\u610F\u540E\u9762\u8981\u548C path-patterns \u4FDD\u6301\u4E00\u81F4\uFF0C\u201C/\u201D\u7ED3\u5C3E\uFF0C\u672C\u5730\u5B58\u50A8\u5EFA\u8BAE\u4F7F\u7528\u76F8\u5BF9\u8DEF\u5F84\uFF0C\u65B9\u4FBF\u540E\u671F\u66F4\u6362\u57DF\u540D +spring.file-storage.local[0].domain= +# \u5B58\u50A8\u5730\u5740 +spring.file-storage.local[0].base-path=C:/jxj/prod/backEnd/itbgpImage/ +# \u8BBF\u95EE\u8DEF\u5F84\uFF0C\u5F00\u542F enable-access \u540E\uFF0C\u901A\u8FC7\u6B64\u8DEF\u5F84\u53EF\u4EE5\u8BBF\u95EE\u5230\u4E0A\u4F20\u7684\u6587\u4EF6 +spring.file-storage.local[0].path-patterns= spring.file-storage.aliyun-oss[0].platform=aliyun-oss spring.file-storage.aliyun-oss[0].enable-storage=false spring.file-storage.aliyun-oss[0].access-key= @@ -67,5 +65,7 @@ spring.boot.admin.client.instance.name=zjsj # \u6C34\u7535\u6570\u636E\u63A8\u9001\u5730\u5740 double-carbon.water-data-url=http://test.cesms.net double-carbon.ammeter-data-url=http://test.cesms.net +license.licensePath=C:/jxj/prod/backEnd/license/license.lic +license.publicKeysStorePath=C:/jxj/prod/backEnd/license/publicCerts.keystore #\u9AD8\u652F\u6A21\u7684tcp\u670D\u52A1\u7AEF\u7684\u7AEF\u53E3\u53F7 high_formwork.netty.port=15333