bug修复
This commit is contained in:
guo
parent
34d71ba875
commit
679a961373
@ -1,6 +1,7 @@
|
||||
package com.zhgd.xmgl.modules.basicdata.controller;
|
||||
|
||||
|
||||
import com.zhgd.jeecg.common.execption.OpenAlertException;
|
||||
import com.zhgd.xmgl.modules.basicdata.service.UploadFileService;
|
||||
import io.swagger.annotations.Api;
|
||||
import io.swagger.annotations.ApiImplicitParam;
|
||||
@ -36,6 +37,9 @@ public class UploadFileController {
|
||||
|
||||
@PostMapping(value = "/image")
|
||||
public Map<String, Object> uploadImage(@RequestParam("files") MultipartFile[] files) {
|
||||
if (files.length == 0) {
|
||||
throw new OpenAlertException("请求参数名错误，正确的参数名为files");
|
||||
}
|
||||
Map<String, Object> resultMap = new HashMap<>();
|
||||
try {
|
||||
resultMap = uploadFileService.uploadImage(files);
|
||||
|
||||
@ -7,6 +7,7 @@ import io.swagger.annotations.ApiImplicitParams;
|
||||
|
||||
import java.util.HashMap;
|
||||
|
||||
import org.springframework.validation.annotation.Validated;
|
||||
import springfox.documentation.annotations.ApiIgnore;
|
||||
|
||||
import java.util.List;
|
||||
@ -85,9 +86,8 @@ public class BridgeProduceRecordController {
|
||||
*/
|
||||
@ApiOperation(value = "添加桥梁生产记录信息", notes = "添加桥梁生产记录信息", httpMethod = "POST")
|
||||
@PostMapping(value = "/add")
|
||||
public Result<BridgeProduceRecord> add(@RequestBody BridgeProduceRecord bridgeProduceRecord) {
|
||||
bridgeProduceRecord.setId(null);
|
||||
bridgeProduceRecordService.save(bridgeProduceRecord);
|
||||
public Result<BridgeProduceRecord> add(@Validated @RequestBody BridgeProduceRecord bridgeProduceRecord) {
|
||||
bridgeProduceRecordService.add(bridgeProduceRecord);
|
||||
return Result.ok();
|
||||
}
|
||||
|
||||
|
||||
@ -1,17 +1,17 @@
|
||||
package com.zhgd.xmgl.modules.bridgeproduce.entity;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.util.Date;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.IdType;
|
||||
import com.baomidou.mybatisplus.annotation.TableId;
|
||||
import com.baomidou.mybatisplus.annotation.TableName;
|
||||
import lombok.Data;
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import org.springframework.format.annotation.DateTimeFormat;
|
||||
import org.jeecgframework.poi.excel.annotation.Excel;
|
||||
import io.swagger.annotations.ApiModel;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
import org.jeecgframework.poi.excel.annotation.Excel;
|
||||
import org.springframework.format.annotation.DateTimeFormat;
|
||||
|
||||
import javax.validation.constraints.NotNull;
|
||||
import java.io.Serializable;
|
||||
|
||||
/**
|
||||
* @Description: 桥梁生产记录
|
||||
@ -31,6 +31,12 @@ public class BridgeProduceRecord implements Serializable {
|
||||
@TableId(type = IdType.ASSIGN_ID)
|
||||
@ApiModelProperty(value = "主键id")
|
||||
private java.lang.Long id;
|
||||
/**
|
||||
* 桥梁（生产记录）id
|
||||
*/
|
||||
@NotNull
|
||||
@ApiModelProperty(value = "桥梁（生产记录）id")
|
||||
private java.lang.Long bridgeProduceId;
|
||||
/**
|
||||
* 桥梁名称
|
||||
*/
|
||||
|
||||
@ -18,4 +18,7 @@ public interface IBridgeProduceRecordService extends IService<BridgeProduceRecor
|
||||
IPage<BridgeProduceRecord> queryPageList(HashMap<String, Object> paramMap);
|
||||
|
||||
List<BridgeProduceRecord> queryList(HashMap<String, Object> paramMap);
|
||||
|
||||
void add(BridgeProduceRecord bridgeProduceRecord);
|
||||
|
||||
}
|
||||
|
||||
@ -1,8 +1,13 @@
|
||||
package com.zhgd.xmgl.modules.bridgeproduce.service.impl;
|
||||
|
||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||
import com.zhgd.jeecg.common.execption.OpenAlertException;
|
||||
import com.zhgd.xmgl.modules.bridgeproduce.entity.BridgeProduce;
|
||||
import com.zhgd.xmgl.modules.bridgeproduce.entity.BridgeProduceRecord;
|
||||
import com.zhgd.xmgl.modules.bridgeproduce.mapper.BridgeProduceMapper;
|
||||
import com.zhgd.xmgl.modules.bridgeproduce.mapper.BridgeProduceRecordMapper;
|
||||
import com.zhgd.xmgl.modules.bridgeproduce.service.IBridgeProduceRecordService;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Service;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||
import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||
@ -24,6 +29,9 @@ import com.zhgd.xmgl.util.RefUtil;
|
||||
*/
|
||||
@Service
|
||||
public class BridgeProduceRecordServiceImpl extends ServiceImpl<BridgeProduceRecordMapper, BridgeProduceRecord> implements IBridgeProduceRecordService {
|
||||
@Autowired
|
||||
BridgeProduceMapper bridgeProduceMapper;
|
||||
|
||||
@Override
|
||||
public IPage<BridgeProduceRecord> queryPageList(HashMap<String, Object> paramMap) {
|
||||
QueryWrapper<BridgeProduceRecord> queryWrapper = getQueryWrapper(paramMap);
|
||||
@ -39,6 +47,18 @@ public class BridgeProduceRecordServiceImpl extends ServiceImpl<BridgeProduceRec
|
||||
return dealList(this.list(queryWrapper));
|
||||
}
|
||||
|
||||
@Override
|
||||
public void add(BridgeProduceRecord bridgeProduceRecord) {
|
||||
bridgeProduceRecord.setId(null);
|
||||
BridgeProduce bridgeProduce = bridgeProduceMapper.selectById(bridgeProduceRecord.getBridgeProduceId());
|
||||
if (bridgeProduce == null) {
|
||||
throw new OpenAlertException("桥梁不存在");
|
||||
}
|
||||
bridgeProduceRecord.setProjectSn(bridgeProduce.getProjectSn());
|
||||
bridgeProduceRecord.setBridgeName(bridgeProduce.getBridgeName());
|
||||
save(bridgeProduceRecord);
|
||||
}
|
||||
|
||||
private QueryWrapper<BridgeProduceRecord> getQueryWrapper(HashMap<String, Object> paramMap) {
|
||||
QueryWrapper<BridgeProduceRecord> queryWrapper = QueryGenerator.initPageQueryWrapper(BridgeProduceRecord.class, paramMap);
|
||||
queryWrapper.orderByDesc(RefUtil.fieldNameUlc(BridgeProduceRecord::getId));
|
||||
|
||||
@ -2,11 +2,13 @@ package com.zhgd.xmgl.modules.bridgeproduce.service.impl;
|
||||
|
||||
import cn.hutool.core.io.FileUtil;
|
||||
import cn.hutool.core.util.IdUtil;
|
||||
import cn.hutool.core.util.StrUtil;
|
||||
import cn.hutool.extra.qrcode.QrCodeUtil;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||
import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||
import com.zhgd.jeecg.common.execption.OpenAlertException;
|
||||
import com.zhgd.jeecg.common.system.query.QueryGenerator;
|
||||
import com.zhgd.xmgl.modules.bridgeproduce.entity.BridgeProduce;
|
||||
import com.zhgd.xmgl.modules.bridgeproduce.mapper.BridgeProduceMapper;
|
||||
@ -30,6 +32,9 @@ import java.util.List;
|
||||
public class BridgeProduceServiceImpl extends ServiceImpl<BridgeProduceMapper, BridgeProduce> implements IBridgeProduceService {
|
||||
@Value("${basePath}")
|
||||
private String basePath;
|
||||
@Value("${bridgeProduceQrCodeUrl:}")
|
||||
private String bridgeProduceQrCodeUrl;
|
||||
|
||||
|
||||
@Override
|
||||
public IPage<BridgeProduce> queryPageList(HashMap<String, Object> paramMap) {
|
||||
@ -48,13 +53,16 @@ public class BridgeProduceServiceImpl extends ServiceImpl<BridgeProduceMapper, B
|
||||
|
||||
@Override
|
||||
public void add(BridgeProduce bridgeProduce) {
|
||||
if (StrUtil.isBlank(bridgeProduceQrCodeUrl)) {
|
||||
throw new OpenAlertException("后台配置错误，h5地址未配置");
|
||||
}
|
||||
bridgeProduce.setId(null);
|
||||
save(bridgeProduce);
|
||||
// 生成指定url对应的二维码到文件，宽和高都是300像素
|
||||
String name = IdUtil.simpleUUID() + ".jpg";
|
||||
String absolutePath = new File(basePath, name).getAbsolutePath();
|
||||
bridgeProduce.setQrCode(name);
|
||||
QrCodeUtil.generate("https://hutool.cn/?bridgeProduceId=" + bridgeProduce.getId(), 300, 300, FileUtil.file(absolutePath));//todo
|
||||
QrCodeUtil.generate(String.format("%s?bridgeProduceId=%s&bridgeName=%s", bridgeProduceQrCodeUrl, bridgeProduce.getId(), bridgeProduce.getBridgeName()), 300, 300, FileUtil.file(absolutePath));
|
||||
updateById(bridgeProduce);
|
||||
}
|
||||
|
||||
|
||||
@ -97,5 +97,17 @@ public class VehiclePositionDev implements Serializable {
|
||||
@TableField(exist = false)
|
||||
@ApiModelProperty(value = "在线状态（0.离线 1.在线）")
|
||||
private java.lang.Integer online;
|
||||
/**
|
||||
* 当前位置-经度
|
||||
*/
|
||||
@Excel(name = "当前位置-经度", width = 15)
|
||||
@ApiModelProperty(value = "当前位置-经度")
|
||||
private java.lang.Double longitude;
|
||||
/**
|
||||
* 当前位置-维度
|
||||
*/
|
||||
@Excel(name = "当前位置-维度", width = 15)
|
||||
@ApiModelProperty(value = "当前位置-维度")
|
||||
private java.lang.Double latitude;
|
||||
|
||||
}
|
||||
|
||||
@ -2,8 +2,14 @@
|
||||
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||
<mapper namespace="com.zhgd.xmgl.modules.vehicleposition.mapper.VehiclePositionDevMapper">
|
||||
<select id="pageList" resultType="com.zhgd.xmgl.modules.vehicleposition.entity.VehiclePositionDev">
|
||||
select *,wi.worker_name personName from vehicle_position_dev vpd
|
||||
join worker_info wi on vpd.worker_info_id = wi.id
|
||||
select *, wi.worker_name personName
|
||||
from vehicle_position_dev vpd
|
||||
left join worker_info wi on vpd.worker_info_id = wi.id
|
||||
left join (select *
|
||||
from vehicle_position_data t1
|
||||
join (select max(id) id from vehicle_position_data group by dev_sn) t2 on t1.id=t2.id
|
||||
) vpd2
|
||||
on vpd2.dev_sn = vpd.dev_sn
|
||||
${ew.customSqlSegment}
|
||||
</select>
|
||||
</mapper>
|
||||
|
||||
@ -8,10 +8,12 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||
import com.zhgd.jeecg.common.system.query.QueryGenerator;
|
||||
import com.zhgd.xmgl.modules.vehicleposition.entity.VehiclePositionDev;
|
||||
import com.zhgd.xmgl.modules.vehicleposition.mapper.VehiclePositionDataMapper;
|
||||
import com.zhgd.xmgl.modules.vehicleposition.mapper.VehiclePositionDevMapper;
|
||||
import com.zhgd.xmgl.modules.vehicleposition.service.IVehiclePositionDevService;
|
||||
import com.zhgd.xmgl.util.PageUtil;
|
||||
import com.zhgd.xmgl.util.RefUtil;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import java.util.Date;
|
||||
@ -26,6 +28,9 @@ import java.util.List;
|
||||
*/
|
||||
@Service
|
||||
public class VehiclePositionDevServiceImpl extends ServiceImpl<VehiclePositionDevMapper, VehiclePositionDev> implements IVehiclePositionDevService {
|
||||
@Autowired
|
||||
VehiclePositionDataMapper vehiclePositionDataMapper;
|
||||
|
||||
@Override
|
||||
public IPage<VehiclePositionDev> queryPageList(HashMap<String, Object> paramMap) {
|
||||
QueryWrapper<VehiclePositionDev> queryWrapper = getQueryWrapper(paramMap);
|
||||
|
||||
@ -245,6 +245,7 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
|
||||
.antMatchers("/xmgl/sjSafeEnvironmentFile/uploadfile").permitAll()
|
||||
.antMatchers("/api/uploadTagLowVoltageAlarm").permitAll()
|
||||
.antMatchers("/xmgl/bridgeProduceRecord/page").permitAll()
|
||||
.antMatchers("/xmgl/bridgeProduceRecord/list").permitAll()
|
||||
.antMatchers("/xmgl/bridgeProduceRecord/add").permitAll()
|
||||
.antMatchers(HttpMethod.OPTIONS, "/**").anonymous()
|
||||
.anyRequest().authenticated() // 剩下所有的验证都需要验证
|
||||
|
||||
@ -102,3 +102,5 @@ xiwon.appId=1690940695416
|
||||
xiwon.appSecret=b6162078-6f1c-4f2c-8cd5-0873f45199b2
|
||||
#吉联达的推送合作单位、班组、部门、人员的url，如：http://127.9.90.1:7123
|
||||
jld_push_url=
|
||||
#桥梁生产记录二维码url
|
||||
bridgeProduceQrCodeUrl=http://192.168.34.173:8084/#/
|
||||
|
||||
@ -1,74 +0,0 @@
|
||||
#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=11120
|
||||
#server.port=30246
|
||||
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
|
||||
arcsoft.dllPath=C:/jxj/prod/backEnd/dll
|
||||
security.enable=true
|
||||
isGetStandardData=false
|
||||
isGetEnvironmentData=false
|
||||
isGetFaceFeatureDate=false
|
||||
#\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=zjsjTopic
|
||||
serverUrl=http://127.0.0.1:11120
|
||||
#serverUrl=http://182.90.224.237:7000
|
||||
#serverUrl=http://127.0.0.1:6023
|
||||
#\u89C6\u9891\u5206\u6790url
|
||||
video-analysis-url=
|
||||
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=
|
||||
spring.file-storage.aliyun-oss[0].secret-key=
|
||||
spring.file-storage.aliyun-oss[0].end-point=
|
||||
spring.file-storage.aliyun-oss[0].bucket-name=
|
||||
# \u8BBF\u95EE\u57DF\u540D\uFF0C\u6CE8\u610F\u201C/\u201D\u7ED3\u5C3E\uFF0C\u4F8B\u5982\uFF1Ahttps://abc.oss-cn-shanghai.aliyuncs.com/
|
||||
spring.file-storage.aliyun-oss[0].domain=
|
||||
spring.file-storage.aliyun-oss[0].base-path=
|
||||
# admin\u4E2D\u5BF9\u5E94\u7684\u5730\u5740\u53CA\u5B9E\u4F8B\u540D
|
||||
spring.boot.admin.client.instance.service-url=http://localhost:18070
|
||||
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
|
||||
active.environment.name=other-env-show
|
||||
#token过期时间（分钟）
|
||||
userTokenExpireMinute=10
|
||||
Loading…
x
Reference in New Issue
Block a user