From 68cf2a5b521d3ac6ff7e2e8583b2994fa75a4024 Mon Sep 17 00:00:00 2001 From: 18616268358 <1440265357@qq.com> Date: Wed, 24 May 2023 09:23:27 +0800 Subject: [PATCH] =?UTF-8?q?#20230510=20=E6=AC=A3=E5=BD=B1=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E5=B9=B3=E5=8F=B0=E8=A3=85=E7=BD=AE=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/TermChannelCoordinateDto.java | 8 +-- .../dto/TerminalChannelsDto.java | 2 + .../dto/TerminalsAndLineAndChannelDto.java | 2 +- .../entity/TerminalPhoto.java | 12 ++++ .../model/TerminalPhotoListModel.java | 15 +++++ .../shxy/xymanager_common/vo/PhotoMarkVo.java | 13 ++-- .../xymanager_common/vo/PhotoParamsVo.java | 2 +- .../xymanager_dao/dao/TerminalPhotoDao.java | 3 + .../resources/mappers/TerminalPhotoDao.xml | 64 +++++++++++++++++-- .../main/resources/mappers/TerminalsDao.xml | 18 +++--- .../config/CustomSecurityConfig.java | 3 +- .../impl/SysUserServiceImpl.java | 11 ++-- .../impl/TerminalPhotoServiceImpl.java | 5 ++ .../impl/TerminalServiceImpl.java | 23 ++++--- 14 files changed, 138 insertions(+), 43 deletions(-) diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/dto/TermChannelCoordinateDto.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/dto/TermChannelCoordinateDto.java index 0c63b47..4439bbf 100644 --- a/xymanager_common/src/main/java/com/shxy/xymanager_common/dto/TermChannelCoordinateDto.java +++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/dto/TermChannelCoordinateDto.java @@ -10,13 +10,13 @@ public class TermChannelCoordinateDto { private Integer pathId; - private Integer x1; + private float x1; - private Integer x2; + private float x2; - private Integer y2; + private float y2; - private Integer y1; + private float y1; } diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/dto/TerminalChannelsDto.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/dto/TerminalChannelsDto.java index 04b95cd..3a4aafc 100644 --- a/xymanager_common/src/main/java/com/shxy/xymanager_common/dto/TerminalChannelsDto.java +++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/dto/TerminalChannelsDto.java @@ -9,6 +9,8 @@ public class TerminalChannelsDto implements Serializable { private Integer id; + private Integer photoId; + private String name; private String path; diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/dto/TerminalsAndLineAndChannelDto.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/dto/TerminalsAndLineAndChannelDto.java index ccfa437..7cfbaff 100644 --- a/xymanager_common/src/main/java/com/shxy/xymanager_common/dto/TerminalsAndLineAndChannelDto.java +++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/dto/TerminalsAndLineAndChannelDto.java @@ -48,7 +48,7 @@ public class TerminalsAndLineAndChannelDto implements Serializable { private Integer height; - private Integer color; + private String color; private Short boderWidth; diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/TerminalPhoto.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/TerminalPhoto.java index c80342c..a7c817e 100644 --- a/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/TerminalPhoto.java +++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/TerminalPhoto.java @@ -1,10 +1,12 @@ package com.shxy.xymanager_common.entity; +import com.shxy.xymanager_common.dto.TermChannelCoordinateDto; import lombok.Data; import java.io.Serializable; import java.math.BigInteger; import java.util.Date; +import java.util.List; @Data public class TerminalPhoto implements Serializable { @@ -36,6 +38,16 @@ public class TerminalPhoto implements Serializable { private Date createTime; + private Integer markWidth; + + private Integer markHeight; + + private String color; + + private Short boderWidth; + + private List lineList; + private static final long serialVersionUID = 1L; } \ No newline at end of file diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/model/TerminalPhotoListModel.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/model/TerminalPhotoListModel.java index 7bf7198..3f8e601 100644 --- a/xymanager_common/src/main/java/com/shxy/xymanager_common/model/TerminalPhotoListModel.java +++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/model/TerminalPhotoListModel.java @@ -1,5 +1,6 @@ package com.shxy.xymanager_common.model; +import com.shxy.xymanager_common.dto.TermChannelCoordinateDto; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -66,5 +67,19 @@ public class TerminalPhotoListModel implements Serializable { @ApiModelProperty(value = "拍照类型", example = "123456") private Integer mediaType; + @ApiModelProperty(value = "绘制宽度", example = "123456") + private Integer markWidth; + + @ApiModelProperty(value = "绘制高度", example = "123456") + private Integer markHeight; + + @ApiModelProperty(value = "颜色", example = "123456") + private String color; + + private Short boderWidth; + + @ApiModelProperty(value = "坐标", example = "123456") + private List list; + } } diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/PhotoMarkVo.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/PhotoMarkVo.java index 5171937..de5a58c 100644 --- a/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/PhotoMarkVo.java +++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/PhotoMarkVo.java @@ -30,7 +30,7 @@ public class PhotoMarkVo { @NotNull(message = "线条颜色不能缺少") @ApiModelProperty(value = "线条颜色", example = "213") - private Integer color; + private String color; @NotNull(message = "线条宽度不能缺少") @ApiModelProperty(value = "线条宽度", example = "213") @@ -39,6 +39,9 @@ public class PhotoMarkVo { @ApiModelProperty(value = "绘制编号", example = "213") private Integer id; + @ApiModelProperty(value = "照片编号", example = "213") + private Integer photoId; + @ApiModelProperty(value = "绘制编号", example = "213") private Date createTime; @@ -51,12 +54,12 @@ public class PhotoMarkVo { @ApiModelProperty(value = "线段ID", example = "213") private Integer markId; @ApiModelProperty(value = "线段起始坐标x", example = "213") - private Integer x1; + private float x1; @ApiModelProperty(value = "线段结束坐标x", example = "213") - private Integer x2; + private float x2; @ApiModelProperty(value = "线段起始坐标y", example = "213") - private Integer y1; + private float y1; @ApiModelProperty(value = "线段结束坐标y", example = "213") - private Integer y2; + private float y2; } } diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/PhotoParamsVo.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/PhotoParamsVo.java index 25c01d6..605a84b 100644 --- a/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/PhotoParamsVo.java +++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/PhotoParamsVo.java @@ -7,7 +7,7 @@ import lombok.Data; import javax.validation.constraints.NotNull; @Data -@ApiModel(value = "图片采集参数对象", description = "图片采集参数对象") +@ApiModel(value = "图片对象", description = "图片采集参数对象") public class PhotoParamsVo{ @ApiModelProperty(value = "装置编号", example = "123456") private Integer termId; diff --git a/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/TerminalPhotoDao.java b/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/TerminalPhotoDao.java index 0e94d45..f6c784e 100644 --- a/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/TerminalPhotoDao.java +++ b/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/TerminalPhotoDao.java @@ -60,4 +60,7 @@ public interface TerminalPhotoDao { void updatePhotoMark(PhotoMarkVo vo); + void updatePhotoMarkId(PhotoMarkVo vo); + + } \ No newline at end of file diff --git a/xymanager_dao/src/main/resources/mappers/TerminalPhotoDao.xml b/xymanager_dao/src/main/resources/mappers/TerminalPhotoDao.xml index 093970d..e14464e 100644 --- a/xymanager_dao/src/main/resources/mappers/TerminalPhotoDao.xml +++ b/xymanager_dao/src/main/resources/mappers/TerminalPhotoDao.xml @@ -45,17 +45,58 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + id, term_id, channel_id,orginal_id, media_type,preset_id, width, height, file_size, photo_time, recv_time, path, thumb,create_time - select - - from terminal_photos - where term_id = #{terminalid} and photo_time between #{starttime} and #{endtime} + tp.id as id, tp.term_id as term_id, tp.channel_id as channel_id,tp.orginal_id as orginal_id, + tp.media_type as media_type,tp.preset_id as preset_id, tp.width as width, tp.height as height, + tp.file_size as file_size, tp.photo_time as photo_time, tp.recv_time as recv_time, + tp.path as path, tp.thumb as thumb,tp.create_time as create_time, + tpm.width as width, + tpm.height as height, + tpm.color as color, + tpm.boder_width as boder_width, + tpm.id as mark_id, + tpmp.id as path_id, + tpmp.x1 as x1, + tpmp.x2 as x2, + tpmp.y1 as y1, + tpmp.y2 as y2 + from terminal_photos tp left join terminal_photo_marks tpm on tp.mark_id = tpm.id + left join terminal_photo_mark_paths tpmp on tpmp.mark_id = tpm.id + where tp.term_id = #{terminalid} and photo_time between #{starttime} and #{endtime} - and channel_id in + and tp.channel_id in #{item} @@ -397,7 +438,18 @@ where id = #{id} - + + + update `terminal_photos` + + + mark_id = #{id,jdbcType=VARCHAR}, + + + where id = #{photoId} + + + delete from terminal_photo_mark_paths where mark_id = #{markId} diff --git a/xymanager_dao/src/main/resources/mappers/TerminalsDao.xml b/xymanager_dao/src/main/resources/mappers/TerminalsDao.xml index c1683f7..726617f 100644 --- a/xymanager_dao/src/main/resources/mappers/TerminalsDao.xml +++ b/xymanager_dao/src/main/resources/mappers/TerminalsDao.xml @@ -43,19 +43,20 @@ - + + - - - - + + + + @@ -163,7 +164,8 @@ tpmp.x2 as x2, tpmp.y1 as y1, tpmp.y2 as y2, - tp.path as path + tp.path as path, + tp.id as photoId from (((((((terminals a left join `lines` b on a.line_id = b.id ) left join tower c on a.tower_id = c.id) @@ -173,9 +175,9 @@ left join terminal_photo_mark_paths tpmp on tpmp.mark_id = tpm.id) left join ( - SELECT path,term_id,channel_id + SELECT path,term_id,channel_id,id from terminal_photos - where id in (select max(id) from terminal_photos where media_type =1 GROUP BY term_id,channel_id) + where id in (select max(id) from terminal_photos where media_type =0 GROUP BY term_id,channel_id) ) tp on tp.channel_id = e.id and tp.term_id = a.id ) WHERE a.status = 1 order by a.create_time desc diff --git a/xymanager_framework/src/main/java/com/shxy/xymanager_framework/config/CustomSecurityConfig.java b/xymanager_framework/src/main/java/com/shxy/xymanager_framework/config/CustomSecurityConfig.java index 7992ea3..800dd42 100644 --- a/xymanager_framework/src/main/java/com/shxy/xymanager_framework/config/CustomSecurityConfig.java +++ b/xymanager_framework/src/main/java/com/shxy/xymanager_framework/config/CustomSecurityConfig.java @@ -21,7 +21,8 @@ public class CustomSecurityConfig implements WebMvcConfigurer { public void addInterceptors(InterceptorRegistry registry) { registry.addInterceptor(this.jwtInterceptor) .excludePathPatterns("/swagger-ui.html") - .excludePathPatterns("/*") + .excludePathPatterns("/api/login") + .excludePathPatterns("/login") .excludePathPatterns("/doc.html") .excludePathPatterns("/swagger-resources/**") .excludePathPatterns("/*/api-docs") diff --git a/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/SysUserServiceImpl.java b/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/SysUserServiceImpl.java index d426805..17f562e 100644 --- a/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/SysUserServiceImpl.java +++ b/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/SysUserServiceImpl.java @@ -1,9 +1,6 @@ package com.shxy.xymanager_service.impl; - -import cn.hutool.core.bean.BeanUtil; -import cn.hutool.core.bean.copier.CopyOptions; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.date.DateTime; import com.github.pagehelper.PageInfo; @@ -11,12 +8,10 @@ import com.google.common.collect.Lists; import com.shxy.xymanager_common.bean.ServiceBody; import com.shxy.xymanager_common.bean.SysUser; import com.shxy.xymanager_common.config.CustomRsaProperties; -import com.shxy.xymanager_common.dto.TerminalsAndLineAndChannelDto; import com.shxy.xymanager_common.entity.UserSession; import com.shxy.xymanager_common.enums.CommonStatus; import com.shxy.xymanager_common.exception.Asserts; import com.shxy.xymanager_common.model.SysUserModel; -import com.shxy.xymanager_common.model.TerminalListModel; import com.shxy.xymanager_common.page.PageUtils; import com.shxy.xymanager_common.util.MyDateUtils; import com.shxy.xymanager_common.util.RsaUtils; @@ -37,8 +32,10 @@ import org.springframework.stereotype.Service; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.RequestBody; -import java.math.BigInteger; -import java.util.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; /** diff --git a/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalPhotoServiceImpl.java b/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalPhotoServiceImpl.java index a841830..28b46d6 100644 --- a/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalPhotoServiceImpl.java +++ b/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalPhotoServiceImpl.java @@ -124,6 +124,11 @@ public class TerminalPhotoServiceImpl implements TerminalPhotoService { photoBean.setPhotoTime(MyDateUtils.date(phototime.longValue())); BigInteger rectime = MyDateUtils.TimeSecond2MillSecond(item.getRecvTime().longValue()); photoBean.setRecvTime(MyDateUtils.date(rectime.longValue())); + photoBean.setColor(item.getColor()); + photoBean.setBoderWidth(item.getBoderWidth()); + photoBean.setMarkHeight(item.getMarkHeight()); + photoBean.setMarkWidth(item.getMarkWidth()); + photoBean.setList(item.getLineList()); beans.add(photoBean); } model.setList(beans); diff --git a/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalServiceImpl.java b/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalServiceImpl.java index fcc856c..38e6d7d 100644 --- a/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalServiceImpl.java +++ b/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalServiceImpl.java @@ -84,9 +84,13 @@ public class TerminalServiceImpl implements TerminalService { model.setList(new ArrayList<>()); } else { list.forEach(var->{ - var.getList().stream().forEach(line->{ - line.setPath(photoaddress+line.getPath()); - }); + if(CollectionUtil.isNotEmpty(var.getList())) { + var.getList().stream().forEach(line -> { + if (StringUtils.isNotBlank(line.getPath())) { + line.setPath(photoaddress + line.getPath()); + } + }); + } }); List beans = BeanUtil.copyToList(list, TerminalListModel.TerminalBean.class, CopyOptions.create().ignoreCase()); model.setList(beans); @@ -322,23 +326,22 @@ public class TerminalServiceImpl implements TerminalService { @Override @Transactional public ServiceBody updateCoordinate(PhotoMarkVo vo) { - int result; + int result = 0; Date date = new Date(); vo.setCreateTime(date); if(null!=vo.getId()) { terminalPhotoDao.deleteByMarkId(vo.getId()); terminalPhotoDao.updatePhotoMark(vo); - result = terminalPhotoDao.addPhotoMarkPath(vo.getList(),vo.getId()); }else{ terminalPhotoDao.addPhotoMark(vo); - result = terminalPhotoDao.addPhotoMarkPath(vo.getList(),vo.getId()); } - - if(result>0){ - return Asserts.success("保存成功"); + if(CollectionUtil.isNotEmpty(vo.getList())) { + result = terminalPhotoDao.addPhotoMarkPath(vo.getList(), vo.getId()); } - return Asserts.error("保存失败"); + terminalPhotoDao.updatePhotoMarkId(vo); + + return Asserts.success("保存成功"); } }