From 496990423c0489c21e85d2f9551c9f63f690e4b9 Mon Sep 17 00:00:00 2001 From: 18616268358 <1440265357@qq.com> Date: Wed, 24 May 2023 09:59:13 +0800 Subject: [PATCH 1/3] =?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 --- .../xymanager_admin/XymanagerAdminApplicationTests.java | 8 -------- .../src/main/resources/mappers/TerminalPhotoDao.xml | 2 +- .../xymanager_service/impl/TerminalPhotoServiceImpl.java | 2 +- .../shxy/xymanager_service/impl/TerminalServiceImpl.java | 3 +-- 4 files changed, 3 insertions(+), 12 deletions(-) diff --git a/xymanager_admin/src/test/java/com/shxy/xymanager_admin/XymanagerAdminApplicationTests.java b/xymanager_admin/src/test/java/com/shxy/xymanager_admin/XymanagerAdminApplicationTests.java index d9720c3..0cf4051 100644 --- a/xymanager_admin/src/test/java/com/shxy/xymanager_admin/XymanagerAdminApplicationTests.java +++ b/xymanager_admin/src/test/java/com/shxy/xymanager_admin/XymanagerAdminApplicationTests.java @@ -1,17 +1,11 @@ package com.shxy.xymanager_admin; -import com.shxy.xymanager_common.entity.TerminalSchedulesTemp; -import com.shxy.xymanager_common.enums.CommonStatus; -import com.shxy.xymanager_common.model.TerminalScheduleRuleTimeListModel; -import com.shxy.xymanager_common.util.SaltUtil; import com.shxy.xymanager_dao.dao.*; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; import java.util.ArrayList; -import java.util.Date; -import java.util.List; @SpringBootTest class XymanagerAdminApplicationTests { @@ -127,8 +121,6 @@ class XymanagerAdminApplicationTests { requestidlist.add(3); - List terminalSchedulesTemps = terminalSchedulesTempDao.updateStatusByRequestIdList(requestidlist, CommonStatus.EFFECTIVE.value(), new Date()); - System.out.println(terminalSchedulesTemps.toArray()); } diff --git a/xymanager_dao/src/main/resources/mappers/TerminalPhotoDao.xml b/xymanager_dao/src/main/resources/mappers/TerminalPhotoDao.xml index e14464e..13ca232 100644 --- a/xymanager_dao/src/main/resources/mappers/TerminalPhotoDao.xml +++ b/xymanager_dao/src/main/resources/mappers/TerminalPhotoDao.xml @@ -446,7 +446,7 @@ mark_id = #{id,jdbcType=VARCHAR}, - where id = #{photoId} + where term_id = #{termId} and channel_id = #{channelId} 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 28b46d6..eaf2ecb 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 @@ -427,7 +427,7 @@ public class TerminalPhotoServiceImpl implements TerminalPhotoService { @Override public ServiceBody getPhotoQueryParam(ReturnedPhotoParamsGetVo vo) { GetModel model = new GetModel(); - String cmd = Constants.CMD + "act=imgparams --cmdid=" + vo.getCmdId() + "\t" + "--clientid=10 --reqid=" + Constants.REQUEST_ID + "\t" + "--flag=0 --rf=7 --channel=" + vo.getChannelId(); + String cmd = Constants.CMD + "imgparams --cmdid=" + vo.getCmdId() + "\t" + "--clientid=10 --reqid=" + Constants.REQUEST_ID + "\t" + "--flag=0 --rf=7 --channel=" + vo.getChannelId(); ProcessExecUtils.exec(cmd); model.setRequestId(Integer.parseInt(Constants.REQUEST_ID.toString())); Constants.REQUEST_ID.addAndGet(1); 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 38e6d7d..238787f 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 @@ -326,7 +326,6 @@ public class TerminalServiceImpl implements TerminalService { @Override @Transactional public ServiceBody updateCoordinate(PhotoMarkVo vo) { - int result = 0; Date date = new Date(); vo.setCreateTime(date); if(null!=vo.getId()) { @@ -337,7 +336,7 @@ public class TerminalServiceImpl implements TerminalService { } if(CollectionUtil.isNotEmpty(vo.getList())) { - result = terminalPhotoDao.addPhotoMarkPath(vo.getList(), vo.getId()); + terminalPhotoDao.addPhotoMarkPath(vo.getList(), vo.getId()); } terminalPhotoDao.updatePhotoMarkId(vo); From 4488c1d148c1d13c4363411fdc7eac4302d8f7e0 Mon Sep 17 00:00:00 2001 From: 18616268358 <1440265357@qq.com> Date: Wed, 24 May 2023 10:13:11 +0800 Subject: [PATCH 2/3] =?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 --- .../shxy/xymanager_common/dto/TerminalChannelsDto.java | 8 ++++++++ .../shxy/xymanager_common/model/TerminalListModel.java | 6 ------ xymanager_dao/src/main/resources/mappers/TerminalsDao.xml | 3 --- 3 files changed, 8 insertions(+), 9 deletions(-) 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 3a4aafc..e458381 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 @@ -15,6 +15,14 @@ public class TerminalChannelsDto implements Serializable { private String path; + private float x1; + + private float x2; + + private float y2; + + private float y1; + 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/TerminalListModel.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/model/TerminalListModel.java index 583bd9a..a9a6939 100644 --- a/xymanager_common/src/main/java/com/shxy/xymanager_common/model/TerminalListModel.java +++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/model/TerminalListModel.java @@ -101,8 +101,6 @@ public class TerminalListModel implements Serializable { @ApiModelProperty(value = "通道编号和名称", example = "213") private List list; - @ApiModelProperty(value = "通道编号和名称", example = "213") - private List lineList; } @@ -116,10 +114,6 @@ public class TerminalListModel implements Serializable { private String name; @ApiModelProperty(value = "图片地址", example = "213") private String path; - } - - @Data - public static class CoordinateBeans { @ApiModelProperty(value = "线段起始坐标x", example = "213") private float x1; @ApiModelProperty(value = "线段结束坐标x", example = "213") diff --git a/xymanager_dao/src/main/resources/mappers/TerminalsDao.xml b/xymanager_dao/src/main/resources/mappers/TerminalsDao.xml index a46d717..69af563 100644 --- a/xymanager_dao/src/main/resources/mappers/TerminalsDao.xml +++ b/xymanager_dao/src/main/resources/mappers/TerminalsDao.xml @@ -50,9 +50,6 @@ - - - From 02666e57a433a83cf6f501c21afff44a68fd9ff6 Mon Sep 17 00:00:00 2001 From: 18616268358 <1440265357@qq.com> Date: Wed, 24 May 2023 15:02:55 +0800 Subject: [PATCH 3/3] =?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 --- .../controller/TerminalController.java | 17 ++++- .../xymanager_common/dto/PhotoMarkDto.java | 28 ++++++++ .../dto/TermChannelCoordinateDto.java | 1 - .../dto/TerminalChannelsDto.java | 13 +--- .../dto/TerminalsAndLineAndChannelDto.java | 2 - .../model/PhotoMarkModel.java | 59 +++++++++++++++ .../model/TerminalListModel.java | 30 +------- .../shxy/xymanager_common/vo/MarkReqVo.java | 27 +++++++ .../vo/TerminalPhotoTimeGetVo.java | 2 +- .../xymanager_dao/dao/TerminalPhotoDao.java | 10 +-- .../resources/mappers/TerminalPhotoDao.xml | 72 ++++++++++++++++--- .../mappers/TerminalScheduleTempDao.xml | 20 +++--- .../main/resources/mappers/TerminalsDao.xml | 35 +-------- .../impl/TerminalScheduleRuleServiceImpl.java | 13 ++-- .../impl/TerminalServiceImpl.java | 30 +++++--- .../service/TerminalService.java | 3 + 16 files changed, 244 insertions(+), 118 deletions(-) create mode 100644 xymanager_common/src/main/java/com/shxy/xymanager_common/dto/PhotoMarkDto.java create mode 100644 xymanager_common/src/main/java/com/shxy/xymanager_common/model/PhotoMarkModel.java create mode 100644 xymanager_common/src/main/java/com/shxy/xymanager_common/vo/MarkReqVo.java diff --git a/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/TerminalController.java b/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/TerminalController.java index 61101e0..38cd1bd 100644 --- a/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/TerminalController.java +++ b/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/TerminalController.java @@ -39,11 +39,24 @@ public class TerminalController extends BaseController { } } + @ApiOperation(value = "获取绘制图标", notes = "绘制坐标保存接口", httpMethod = "POST") + @ApiResponses({@ApiResponse(code = 200, message = "请求成功"), @ApiResponse(code = 400, message = "请求参数没填好"), @ApiResponse(code = 404, message = "请求路径没有或页面跳转路径不对")}) + @RequestMapping("/getCoordinate") + @Log(title = "获取绘制图标", type = "查询") + public ResponseReult getCoordinate(@RequestBody @Validated MarkReqVo vo) { + ServiceBody serviceBody = terminalService.getCoordinate(vo); + if (serviceBody.getCode() == ServiceStatus.SUCCESS) { + return ResponseReult.success(serviceBody.getData()); + } else { + return ResponseReult.error(serviceBody.getCode(), serviceBody.getMsg()); + } + } + @ApiOperation(value = "绘制坐标保存", notes = "绘制坐标保存接口", httpMethod = "POST") @ApiResponses({@ApiResponse(code = 200, message = "请求成功"), @ApiResponse(code = 400, message = "请求参数没填好"), @ApiResponse(code = 404, message = "请求路径没有或页面跳转路径不对")}) @RequestMapping("/updateCoordinate") - @Log(title = "绘制坐标保存", type = "查询") - public ResponseReult Coordinate(@RequestBody @Validated PhotoMarkVo vo) { + @Log(title = "绘制坐标保存", type = "更新") + public ResponseReult coordinate(@RequestBody @Validated PhotoMarkVo vo) { ServiceBody serviceBody = terminalService.updateCoordinate(vo); if (serviceBody.getCode() == ServiceStatus.SUCCESS) { return ResponseReult.success(serviceBody.getData()); diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/dto/PhotoMarkDto.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/dto/PhotoMarkDto.java new file mode 100644 index 0000000..69dfe42 --- /dev/null +++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/dto/PhotoMarkDto.java @@ -0,0 +1,28 @@ +package com.shxy.xymanager_common.dto; + +import lombok.Data; + +import java.util.List; + +@Data +public class PhotoMarkDto { + + private Integer id; + + private Integer termId; + + private Integer channelId; + + private Integer width; + + private Integer height; + + private String color; + + private String path; + + private Short boderWidth; + + private List lineList; + +} 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 4439bbf..29db325 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 @@ -8,7 +8,6 @@ import lombok.Data; @Data public class TermChannelCoordinateDto { - private Integer pathId; private float x1; 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 e458381..643fcc7 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 @@ -3,26 +3,15 @@ package com.shxy.xymanager_common.dto; import lombok.Data; import java.io.Serializable; +import java.util.List; @Data public class TerminalChannelsDto implements Serializable { private Integer id; - private Integer photoId; - private String name; - private String path; - - private float x1; - - private float x2; - - private float y2; - - private float y1; - private static final long serialVersionUID = 1L; } \ No newline at end of file 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 7cfbaff..9b14ad1 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 @@ -52,8 +52,6 @@ public class TerminalsAndLineAndChannelDto implements Serializable { private Short boderWidth; - private List lineList; - private List list; private static final long serialVersionUID = 1L; diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/model/PhotoMarkModel.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/model/PhotoMarkModel.java new file mode 100644 index 0000000..d1e3162 --- /dev/null +++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/model/PhotoMarkModel.java @@ -0,0 +1,59 @@ +package com.shxy.xymanager_common.model; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotNull; +import java.io.Serializable; +import java.util.List; + +/** + * 绘制信息 + */ +@Data +@ApiModel(value = "获取绘制信息", description = "获取绘制信息") +public class PhotoMarkModel implements Serializable { + + @ApiModelProperty(value = "通道编号", example = "213") + private Integer termId; + + @ApiModelProperty(value = "绘制ID", example = "213") + private Integer markId; + + @NotNull(message = "通道编号") + @ApiModelProperty(value = "通道编号", example = "213") + private Integer channelId; + + @ApiModelProperty(value = "参考图片宽", example = "213") + private Integer width; + + @ApiModelProperty(value = "参考图片高", example = "213") + private Integer height; + + @ApiModelProperty(value = "线条颜色", example = "213") + private String color; + + @ApiModelProperty(value = "线条宽度", example = "213") + private Short boderWidth; + + @ApiModelProperty(value = "图片地址", example = "213") + private String path; + + @ApiModelProperty(value = "通道编号和名称", example = "213") + private List list; + + + @Data + public static class CoordinateBeans { + @ApiModelProperty(value = "线段起始坐标x", example = "213") + private float x1; + @ApiModelProperty(value = "线段结束坐标x", example = "213") + private float x2; + @ApiModelProperty(value = "线段起始坐标y", example = "213") + private float y1; + @ApiModelProperty(value = "线段结束坐标y", example = "213") + private float y2; + } + +} diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/model/TerminalListModel.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/model/TerminalListModel.java index a9a6939..424402f 100644 --- a/xymanager_common/src/main/java/com/shxy/xymanager_common/model/TerminalListModel.java +++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/model/TerminalListModel.java @@ -82,22 +82,6 @@ public class TerminalListModel implements Serializable { @ApiModelProperty(value = "经度", example = "213") private Double longitude; - - @ApiModelProperty(value = "绘制ID", example = "213") - private Integer markId; - - @ApiModelProperty(value = "参考图片宽", example = "213") - private Integer width; - - @ApiModelProperty(value = "参考图片高", example = "213") - private Integer height; - - @ApiModelProperty(value = "线条颜色", example = "213") - private String color; - - @ApiModelProperty(value = "线条宽度", example = "213") - private Short boderWidth; - @ApiModelProperty(value = "通道编号和名称", example = "213") private List list; @@ -108,19 +92,9 @@ public class TerminalListModel implements Serializable { public static class ChannelBeans { @ApiModelProperty(value = "通道编号", example = "213") private Integer id; - @ApiModelProperty(value = "照片编号", example = "213") - private Integer photoId; @ApiModelProperty(value = "通道名称", example = "213") private String name; - @ApiModelProperty(value = "图片地址", example = "213") - private String path; - @ApiModelProperty(value = "线段起始坐标x", example = "213") - private float x1; - @ApiModelProperty(value = "线段结束坐标x", example = "213") - private float x2; - @ApiModelProperty(value = "线段起始坐标y", example = "213") - private float y1; - @ApiModelProperty(value = "线段结束坐标y", example = "213") - private float y2; } + + } diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/MarkReqVo.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/MarkReqVo.java new file mode 100644 index 0000000..2ececfa --- /dev/null +++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/MarkReqVo.java @@ -0,0 +1,27 @@ +package com.shxy.xymanager_common.vo; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; +import java.util.List; + +@Data +@ApiModel(value = "绘制坐标请求对象", description = "绘制坐标请求对象") +public class MarkReqVo { + @NotNull(message = "装置编号不能为空") + @ApiModelProperty(value = "装置编号", required = true, example = "A0001") + private Integer termId; + + + @NotNull(message = "通道编号不能为空") + @ApiModelProperty(value = "通道编号", required = true, example = "A0001") + private Integer channelId; + + @NotNull(message = "是否需要图片") + @ApiModelProperty(value = "是否需要图片", required = true, example = "0:需要 1:不需要") + private Integer needPic; + +} diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/TerminalPhotoTimeGetVo.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/TerminalPhotoTimeGetVo.java index e4d27ca..906e517 100644 --- a/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/TerminalPhotoTimeGetVo.java +++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/TerminalPhotoTimeGetVo.java @@ -7,7 +7,7 @@ import lombok.Data; import javax.validation.constraints.NotNull; @Data -@ApiModel(value = "拍照时间表触发请求参数", description = "拍照时间表触发请求参数") +@ApiModel(value = "触发请求参数", description = "拍照时间表触发请求参数") public class TerminalPhotoTimeGetVo { @NotNull(message = "通道号") 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 f6c784e..475b0a5 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 @@ -1,9 +1,6 @@ package com.shxy.xymanager_dao.dao; -import com.shxy.xymanager_common.dto.PhotoAndLineAndChannelDto; -import com.shxy.xymanager_common.dto.PhotoParamsDto; -import com.shxy.xymanager_common.dto.TermAndChannelLatestPhotoMapperDto; -import com.shxy.xymanager_common.dto.TerminalPhotoScheduleDto; +import com.shxy.xymanager_common.dto.*; import com.shxy.xymanager_common.entity.TerminalPhoto; import com.shxy.xymanager_common.vo.*; import org.apache.ibatis.annotations.Param; @@ -63,4 +60,9 @@ public interface TerminalPhotoDao { void updatePhotoMarkId(PhotoMarkVo vo); + PhotoMarkDto selectPhotoMark(MarkReqVo vo); + + PhotoMarkDto selectPhotoWithoutPic(MarkReqVo 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 13ca232..8f494fb 100644 --- a/xymanager_dao/src/main/resources/mappers/TerminalPhotoDao.xml +++ b/xymanager_dao/src/main/resources/mappers/TerminalPhotoDao.xml @@ -18,6 +18,21 @@ + + + + + + + + + + + + + + + @@ -438,19 +453,54 @@ where id = #{id} - - - update `terminal_photos` - - - mark_id = #{id,jdbcType=VARCHAR}, - - - where term_id = #{termId} and channel_id = #{channelId} - - delete from terminal_photo_mark_paths where mark_id = #{markId} + + + + + + + \ No newline at end of file diff --git a/xymanager_dao/src/main/resources/mappers/TerminalScheduleTempDao.xml b/xymanager_dao/src/main/resources/mappers/TerminalScheduleTempDao.xml index 602c765..f48789c 100644 --- a/xymanager_dao/src/main/resources/mappers/TerminalScheduleTempDao.xml +++ b/xymanager_dao/src/main/resources/mappers/TerminalScheduleTempDao.xml @@ -17,7 +17,7 @@ select - from terminal_schedules_temp + from terminal_schedule_temp where status = #{status} and request_id in @@ -49,16 +49,16 @@ - delete from terminal_schedules_temp + delete from terminal_schedule_temp where id = #{id,jdbcType=INTEGER} - insert into terminal_schedules_temp (id, term_id, channel_id, + insert into terminal_schedule_temp (id, term_id, channel_id, schedule_id, create_time, update_time ) values (#{id,jdbcType=INTEGER}, #{termId,jdbcType=INTEGER}, #{channelId,jdbcType=INTEGER}, @@ -67,7 +67,7 @@ - insert into terminal_schedules_temp + insert into terminal_schedule_temp (term_id, channel_id, schedule_id, request_id,status,create_time, update_time) values @@ -76,7 +76,7 @@ - insert into terminal_schedules_temp + insert into terminal_schedule_temp term_id, @@ -125,7 +125,7 @@ - update terminal_schedules_temp + update terminal_schedule_temp status = #{status}, @@ -143,7 +143,7 @@ - update terminal_schedules_temp + update terminal_schedule_temp term_id = #{termId,jdbcType=INTEGER}, @@ -164,7 +164,7 @@ where id = #{id,jdbcType=INTEGER} - update terminal_schedules_temp + update terminal_schedule_temp set term_id = #{termId,jdbcType=INTEGER}, channel_id = #{channelId,jdbcType=INTEGER}, schedule_id = #{scheduleId,jdbcType=INTEGER}, diff --git a/xymanager_dao/src/main/resources/mappers/TerminalsDao.xml b/xymanager_dao/src/main/resources/mappers/TerminalsDao.xml index 69af563..d1c7908 100644 --- a/xymanager_dao/src/main/resources/mappers/TerminalsDao.xml +++ b/xymanager_dao/src/main/resources/mappers/TerminalsDao.xml @@ -40,20 +40,9 @@ - - - - - - - - - - - @@ -150,32 +139,12 @@ a.latitude as latitude, a.longitude as longitude, e.id as channel_id, - e.channel_name as channel_name, - 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, - tp.path as path, - tp.id as photoId + e.channel_name as channel_name from - (((((((terminals a left join `lines` b on a.line_id = b.id ) + ((((terminals a left join `lines` b on a.line_id = b.id ) left join tower c on a.tower_id = c.id) left join terminal_channel_mapper d on a.id = d.term_id) left join terminal_channels e on d.channel_id = e.id) - left join terminal_photo_marks tpm on a.id = tpm.term_id and e.id = tpm.channel_id) - left join terminal_photo_mark_paths tpmp on tpmp.mark_id = tpm.id) - left join - ( - SELECT path,term_id,channel_id,id - from terminal_photos - 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_service/src/main/java/com/shxy/xymanager_service/impl/TerminalScheduleRuleServiceImpl.java b/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalScheduleRuleServiceImpl.java index bae4bd0..963e12b 100644 --- a/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalScheduleRuleServiceImpl.java +++ b/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalScheduleRuleServiceImpl.java @@ -242,6 +242,7 @@ public class TerminalScheduleRuleServiceImpl implements TerminalScheduleRuleServ return Asserts.error("没有该拍照时间规则"); } StringBuffer timestr = new StringBuffer(); + int index = 1; for (int j = 0; j < dtoList.size(); j++) { Integer span = dtoList.get(j).getSpan(); Date startTime = dtoList.get(j).getStartTime(); @@ -259,17 +260,21 @@ public class TerminalScheduleRuleServiceImpl implements TerminalScheduleRuleServ span1 = 0; span2 = span; } - String string = "--hour1=" + startHour + "\t" + "--min1=" + startMin + "\t" + "--preset1=255 --hour2=" + endTimeHour + "\t" + "--min2=" + endTimeMin + "\t" - + "--preset2=255 --hour3=" + span1 + "\t" + "--min3=" + span2 + "\t" + "--preset3=255"; + int indexOri = index; + int indexAdd = indexOri+1; + int indexAddT = indexAdd+1; + String string = "--hour"+indexOri+"="+ startHour + "\t" + "--min"+indexOri+"=" + startMin + "\t" + "--preset"+indexOri+"=255 --hour="+(indexAdd)+"=" + endTimeHour + "\t" + "--min"+(indexAdd)+"=" + endTimeMin + "\t" + + "--preset"+(indexAdd)+"=255 --hour"+indexAddT+"=" + span1 + "\t" + "--min"+indexAddT+"=" + span2 + "\t" + "--preset"+indexAddT+"=255"; timestr.append(string); + index++; } ArrayList requestIdList = new ArrayList<>(); for (int x = 0; x < terminalsList.size(); x++) { ChannelAndTermDto channelAndTermDto = terminalsList.get(x); - String cmd = Constants.CMD + "schedule --flag=1 --cmdid=" + channelAndTermDto.getCmdid() + "\t" + "--channel=" + channelAndTermDto.getChannelid() + "\t" + + String cmd = Constants.CMD + "schedule --group="+dtoList.size()+"--flag=1 --cmdid=" + channelAndTermDto.getCmdid() + "\t" + "--channel=" + channelAndTermDto.getChannelid() + "\t" + timestr.toString(); -// ProcessExecUtils.exec(cmd); + ProcessExecUtils.exec(cmd); int requestId = Integer.parseInt(Constants.REQUEST_ID.toString()); Constants.REQUEST_ID.addAndGet(1); requestIdList.add(requestId); 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 238787f..20d10a4 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 @@ -9,6 +9,7 @@ import com.github.pagehelper.PageInfo; import com.shxy.xymanager_common.bean.ServiceBody; import com.shxy.xymanager_common.constant.Constants; import com.shxy.xymanager_common.dto.DyLineAndTerminalNoHeartDto; +import com.shxy.xymanager_common.dto.PhotoMarkDto; import com.shxy.xymanager_common.dto.TerminalInfoDto; import com.shxy.xymanager_common.dto.TerminalsAndLineAndChannelDto; import com.shxy.xymanager_common.entity.TerminalChannelMapper; @@ -83,15 +84,6 @@ public class TerminalServiceImpl implements TerminalService { if (empty) { model.setList(new ArrayList<>()); } else { - list.forEach(var->{ - 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); } @@ -338,9 +330,27 @@ public class TerminalServiceImpl implements TerminalService { if(CollectionUtil.isNotEmpty(vo.getList())) { terminalPhotoDao.addPhotoMarkPath(vo.getList(), vo.getId()); } - terminalPhotoDao.updatePhotoMarkId(vo); return Asserts.success("保存成功"); } + + @Override + public ServiceBody getCoordinate(MarkReqVo vo) { + PhotoMarkModel model = new PhotoMarkModel(); + PhotoMarkDto dto = null; + if(vo.getNeedPic()==0) { + dto = terminalPhotoDao.selectPhotoMark(vo); + if(null!=dto&&StringUtils.isNotBlank(dto.getPath())){ + dto.setPath(photoaddress+dto.getPath()); + } + }else{ + dto = terminalPhotoDao.selectPhotoWithoutPic(vo); + } + + if (null!=dto) { + BeanUtils.copyProperties(dto,model); + } + return Asserts.success(model); + } } diff --git a/xymanager_service/src/main/java/com/shxy/xymanager_service/service/TerminalService.java b/xymanager_service/src/main/java/com/shxy/xymanager_service/service/TerminalService.java index 1f8f6c3..3db5303 100644 --- a/xymanager_service/src/main/java/com/shxy/xymanager_service/service/TerminalService.java +++ b/xymanager_service/src/main/java/com/shxy/xymanager_service/service/TerminalService.java @@ -87,4 +87,7 @@ public interface TerminalService { ServiceBody updateCoordinate(PhotoMarkVo vo); + + ServiceBody getCoordinate(MarkReqVo vo); + }