From abb64f8d929aa635fc73ceba0cfdbd8d78003b5c Mon Sep 17 00:00:00 2001 From: guoshengxiong <1923636941@qq.com> Date: Sun, 28 Sep 2025 18:36:59 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=B7=A5=E5=8D=95=E7=AD=89?= =?UTF-8?q?=E5=85=B6=E4=BB=96bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../WorkTicketOrderAppController.java | 62 +++++++++ .../controller/WorkTicketOrderController.java | 120 ++++++++++++++++++ .../entity/PoliceCameraItemFile.java | 5 + .../policecamera/entity/WorkTicketOrder.java | 74 +++++++++++ .../entity/dto/WorkTicketOrderDto.java | 11 ++ .../entity/vo/WorkTicketOrderVo.java | 11 ++ .../mapper/WorkTicketOrderMapper.java | 44 +++++++ .../mapper/xml/WorkTicketOrderMapper.xml | 15 +++ .../service/IWorkTicketOrderService.java | 55 ++++++++ .../impl/WorkTicketOrderServiceImpl.java | 95 ++++++++++++++ .../service/impl/WorkTicketServiceImpl.java | 31 ++++- .../ProjectVideoConfigController.java | 12 +- .../entity/dto/ProjectVideoConfigDto.java | 14 ++ .../modules/video/entity/vo/VideoGroupVo.java | 2 +- .../video/mapper/xml/VideoItemMapper.xml | 2 +- .../service/impl/VideoGroupServiceImpl.java | 2 +- .../zhgd/xmgl/security/WebSecurityConfig.java | 3 + src/main/java/com/zhgd/xmgl/util/AqiUtil.java | 22 +++- 18 files changed, 570 insertions(+), 10 deletions(-) create mode 100644 src/main/java/com/zhgd/xmgl/modules/policecamera/controller/WorkTicketOrderAppController.java create mode 100644 src/main/java/com/zhgd/xmgl/modules/policecamera/controller/WorkTicketOrderController.java create mode 100644 src/main/java/com/zhgd/xmgl/modules/policecamera/entity/WorkTicketOrder.java create mode 100644 src/main/java/com/zhgd/xmgl/modules/policecamera/entity/dto/WorkTicketOrderDto.java create mode 100644 src/main/java/com/zhgd/xmgl/modules/policecamera/entity/vo/WorkTicketOrderVo.java create mode 100644 src/main/java/com/zhgd/xmgl/modules/policecamera/mapper/WorkTicketOrderMapper.java create mode 100644 src/main/java/com/zhgd/xmgl/modules/policecamera/mapper/xml/WorkTicketOrderMapper.xml create mode 100644 src/main/java/com/zhgd/xmgl/modules/policecamera/service/IWorkTicketOrderService.java create mode 100644 src/main/java/com/zhgd/xmgl/modules/policecamera/service/impl/WorkTicketOrderServiceImpl.java create mode 100644 src/main/java/com/zhgd/xmgl/modules/project/entity/dto/ProjectVideoConfigDto.java diff --git a/src/main/java/com/zhgd/xmgl/modules/policecamera/controller/WorkTicketOrderAppController.java b/src/main/java/com/zhgd/xmgl/modules/policecamera/controller/WorkTicketOrderAppController.java new file mode 100644 index 000000000..ee7387a37 --- /dev/null +++ b/src/main/java/com/zhgd/xmgl/modules/policecamera/controller/WorkTicketOrderAppController.java @@ -0,0 +1,62 @@ +package com.zhgd.xmgl.modules.policecamera.controller; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.zhgd.annotation.OperLog; +import com.zhgd.jeecg.common.api.vo.Result; +import com.zhgd.jeecg.common.execption.OpenAlertException; +import com.zhgd.xmgl.modules.policecamera.entity.PoliceCameraItem; +import com.zhgd.xmgl.modules.policecamera.service.IPoliceCameraItemService; +import com.zhgd.xmgl.modules.policecamera.service.IWorkTicketOrderService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiImplicitParams; +import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.collections4.MapUtils; +import org.simpleframework.xml.core.Validate; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Lazy; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.Map; + + +/** + * @Title: Controller + * @Description: 工作票工单APP + * @author： pds + * @date： 2025-09-28 + * @version： V1.0 + */ +@RestController +@RequestMapping("/xmgl/workTicketOrderApp") +@Slf4j +@Api(tags = "工作票工单APP相关Api") +public class WorkTicketOrderAppController { + @Lazy + @Autowired + private IWorkTicketOrderService workTicketOrderService; + @Lazy + @Autowired + private IPoliceCameraItemService policeCameraItemService; + + @OperLog(operModul = "工作票工单APP管理", operType = "", operDesc = "根据执法记录仪设备sn登录") + @ApiOperation(value = "根据执法记录仪设备sn登录", notes = "根据执法记录仪设备sn登录", httpMethod = "POST") + @ApiImplicitParams({ + @ApiImplicitParam(name = "devSn", value = "设备编号", paramType = "query", required = true, dataType = "Integer"), + }) + @PostMapping(value = "/loginByPoliceCameraSn") + public Result loginByPoliceCameraSn(@RequestBody @Validate Map param) { + String devSn = MapUtils.getString(param, "devSn"); + int count = policeCameraItemService.count(new LambdaQueryWrapper() + .eq(PoliceCameraItem::getDevSn, devSn)); + if (count == 0) { + throw new OpenAlertException("IMEI编号不存在"); + } + return Result.ok(); + } + +} diff --git a/src/main/java/com/zhgd/xmgl/modules/policecamera/controller/WorkTicketOrderController.java b/src/main/java/com/zhgd/xmgl/modules/policecamera/controller/WorkTicketOrderController.java new file mode 100644 index 000000000..78fc0fe01 --- /dev/null +++ b/src/main/java/com/zhgd/xmgl/modules/policecamera/controller/WorkTicketOrderController.java @@ -0,0 +1,120 @@ +package com.zhgd.xmgl.modules.policecamera.controller; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.zhgd.annotation.OperLog; +import com.zhgd.jeecg.common.api.vo.Result; +import com.zhgd.xmgl.modules.policecamera.entity.WorkTicketOrder; +import com.zhgd.xmgl.modules.policecamera.entity.dto.WorkTicketOrderDto; +import com.zhgd.xmgl.modules.policecamera.entity.vo.WorkTicketOrderVo; +import com.zhgd.xmgl.modules.policecamera.service.IWorkTicketOrderService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiImplicitParams; +import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.collections.MapUtils; +import org.simpleframework.xml.core.Validate; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Lazy; +import org.springframework.web.bind.annotation.*; +import springfox.documentation.annotations.ApiIgnore; + +import java.util.HashMap; +import java.util.List; + + + /** + * @Title: Controller + * @Description: 工作票工单 + * @author： pds + * @date： 2025-09-28 + * @version： V1.0 + */ +@RestController +@RequestMapping("/xmgl/workTicketOrder") +@Slf4j +@Api(tags = "工作票工单相关Api") +public class WorkTicketOrderController { + @Lazy + @Autowired + private IWorkTicketOrderService workTicketOrderService; + + /** + * 分页列表查询 + * @return + */ + @OperLog(operModul = "工作票工单管理", operType = "分页查询", operDesc = "分页列表查询工作票工单信息") + @ApiOperation(value = "分页列表查询工作票工单信息", notes = "分页列表查询工作票工单信息", httpMethod="GET") + @ApiImplicitParams({ + @ApiImplicitParam(name = "pageNo", value = "第几页", paramType = "query", required = true, dataType = "Integer"), + @ApiImplicitParam(name = "pageSize", value = "每页显示条数", paramType = "query", required = true, dataType = "Integer"), + }) + @GetMapping(value = "/page") + public Result> queryPageList(@ApiIgnore @RequestParam HashMap param) { + return Result.success(workTicketOrderService.queryPageList(param)); + } + + /** + * 列表查询 + * @return + */ + @OperLog(operModul = "工作票工单管理", operType = "列表查询", operDesc = "列表查询工作票工单信息") + @ApiOperation(value = "列表查询工作票工单信息", notes = "列表查询工作票工单信息", httpMethod="GET") + @GetMapping(value = "/list") + public Result> queryList(@ApiIgnore @RequestParam HashMap param) { + return Result.success(workTicketOrderService.queryList(param)); + } + + /** + * 添加 + * @param workTicketOrderDto + * @return + */ + @OperLog(operModul = "工作票工单管理", operType = "添加", operDesc = "添加工作票工单信息") + @ApiOperation(value = "添加工作票工单信息", notes = "添加工作票工单信息" , httpMethod="POST") + @PostMapping(value = "/add") + public Result add(@RequestBody @Validate WorkTicketOrderDto workTicketOrderDto) { + workTicketOrderService.add(workTicketOrderDto); + return Result.ok(); + } + + /** + * 编辑 + * @param workTicketOrderDto + * @return + */ + @OperLog(operModul = "工作票工单管理", operType = "编辑", operDesc = "编辑工作票工单信息") + @ApiOperation(value = "编辑工作票工单信息", notes = "编辑工作票工单信息" , httpMethod="POST") + @PostMapping(value = "/edit") + public Result edit(@RequestBody WorkTicketOrderDto workTicketOrderDto) { + workTicketOrderService.edit(workTicketOrderDto); + return Result.ok(); + } + + /** + * 通过id删除 + * @return + */ + @OperLog(operModul = "工作票工单管理", operType = "删除", operDesc = "删除工作票工单信息") + @ApiOperation(value = "删除工作票工单信息", notes = "删除工作票工单信息" , httpMethod="POST") + @ApiImplicitParam(name = "id", value = "工作票工单ID", paramType = "body", required = true, dataType = "String", example = "{\"id\":\"1\"}") + @PostMapping(value = "/delete") + public Result delete(@ApiIgnore @RequestBody HashMap map) { + workTicketOrderService.delete(MapUtils.getString(map, "id")); + return Result.ok(); + } + + /** + * 通过id查询 + * @param id + * @return + */ + @OperLog(operModul = "工作票工单管理", operType = "通过id查询", operDesc = "通过id查询工作票工单信息") + @ApiOperation(value = "通过id查询工作票工单信息", notes = "通过id查询工作票工单信息" , httpMethod="GET") + @ApiImplicitParam(name = "id", value = "工作票工单ID", paramType = "query", required = true, dataType = "Integer") + @GetMapping(value = "/queryById") + public Result queryById(@RequestParam(name="id",required=true) String id) { + return Result.success(workTicketOrderService.queryById(id)); + } + +} diff --git a/src/main/java/com/zhgd/xmgl/modules/policecamera/entity/PoliceCameraItemFile.java b/src/main/java/com/zhgd/xmgl/modules/policecamera/entity/PoliceCameraItemFile.java index 75c106940..7d5b19420 100644 --- a/src/main/java/com/zhgd/xmgl/modules/policecamera/entity/PoliceCameraItemFile.java +++ b/src/main/java/com/zhgd/xmgl/modules/policecamera/entity/PoliceCameraItemFile.java @@ -40,6 +40,11 @@ public class PoliceCameraItemFile implements Serializable { */ @ApiModelProperty(value = "工作票历史记录id") private java.lang.Long historyId; + /** + * 工作票工单id + */ + @ApiModelProperty(value = "工作票工单id") + private java.lang.Long orderId; /** * 外部id */ diff --git a/src/main/java/com/zhgd/xmgl/modules/policecamera/entity/WorkTicketOrder.java b/src/main/java/com/zhgd/xmgl/modules/policecamera/entity/WorkTicketOrder.java new file mode 100644 index 000000000..618189a4e --- /dev/null +++ b/src/main/java/com/zhgd/xmgl/modules/policecamera/entity/WorkTicketOrder.java @@ -0,0 +1,74 @@ +package com.zhgd.xmgl.modules.policecamera.entity; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; + +import java.io.Serializable; +/** + * @Description: 工作票工单 + * @author： pds + * @date： 2025-09-28 + * @version： V1.0 + */ +@Data +@TableName("work_ticket_order") +@ApiModel(value="WorkTicketOrder实体类",description="WorkTicketOrder") +public class WorkTicketOrder implements Serializable { + private static final long serialVersionUID = 1L; + + /**id*/ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value="id") + private java.lang.Long id ; + /**工作票id*/ + @ApiModelProperty(value="工作票id") + private java.lang.Long workTicketId ; + /** + * 工作票历史记录id + */ + @ApiModelProperty(value = "工作票历史记录id") + private java.lang.Long historyId; + /** + * 设备编号 + */ + @ApiModelProperty(value = "设备编号") + private java.lang.String devSn; + /**项目sn*/ + @ApiModelProperty(value="项目sn") + private java.lang.String projectSn ; + /**创建时间*/ + @ApiModelProperty(value="创建时间") + private java.util.Date createTime ; + /**更新时间*/ + @ApiModelProperty(value="更新时间") + private java.util.Date updateTime ; + /**工作票编号*/ + @ApiModelProperty(value="工作票编号") + private java.lang.String workTicketNumber ; + /**施工场站s（多个,分割）*/ + @ApiModelProperty(value="施工场站s（多个,分割）") + private java.lang.String constructionAreas ; + /**下发时间*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value="下发时间") + private java.util.Date sendTime ; + /**作业人员*/ + @ApiModelProperty(value="作业人员") + private java.lang.String operator ; + /**作业内容*/ + @ApiModelProperty(value="作业内容") + private java.lang.String workContent ; + /**安全措施*/ + @ApiModelProperty(value="安全措施") + private java.lang.String safetyMeasure ; + /**状态：1:未开始;2:进行中;3:已完成;*/ + @ApiModelProperty(value="状态：1:未开始;2:进行中;3:已完成;") + private java.lang.Integer status ; +} diff --git a/src/main/java/com/zhgd/xmgl/modules/policecamera/entity/dto/WorkTicketOrderDto.java b/src/main/java/com/zhgd/xmgl/modules/policecamera/entity/dto/WorkTicketOrderDto.java new file mode 100644 index 000000000..a657242a5 --- /dev/null +++ b/src/main/java/com/zhgd/xmgl/modules/policecamera/entity/dto/WorkTicketOrderDto.java @@ -0,0 +1,11 @@ +package com.zhgd.xmgl.modules.policecamera.entity.dto; + +import com.zhgd.xmgl.modules.policecamera.entity.WorkTicketOrder; +import io.swagger.annotations.ApiModel; +import lombok.Data; + +@Data +@ApiModel(value="WorkTicketOrderDto实体类",description="WorkTicketOrderDto实体类") +public class WorkTicketOrderDto extends WorkTicketOrder { + +} diff --git a/src/main/java/com/zhgd/xmgl/modules/policecamera/entity/vo/WorkTicketOrderVo.java b/src/main/java/com/zhgd/xmgl/modules/policecamera/entity/vo/WorkTicketOrderVo.java new file mode 100644 index 000000000..b697bed8b --- /dev/null +++ b/src/main/java/com/zhgd/xmgl/modules/policecamera/entity/vo/WorkTicketOrderVo.java @@ -0,0 +1,11 @@ +package com.zhgd.xmgl.modules.policecamera.entity.vo; + +import com.zhgd.xmgl.modules.policecamera.entity.WorkTicketOrder; +import io.swagger.annotations.ApiModel; +import lombok.Data; + +@Data +@ApiModel(value="WorkTicketOrderVo实体类",description="WorkTicketOrderVo实体类") +public class WorkTicketOrderVo extends WorkTicketOrder { + +} diff --git a/src/main/java/com/zhgd/xmgl/modules/policecamera/mapper/WorkTicketOrderMapper.java b/src/main/java/com/zhgd/xmgl/modules/policecamera/mapper/WorkTicketOrderMapper.java new file mode 100644 index 000000000..228103404 --- /dev/null +++ b/src/main/java/com/zhgd/xmgl/modules/policecamera/mapper/WorkTicketOrderMapper.java @@ -0,0 +1,44 @@ +package com.zhgd.xmgl.modules.policecamera.mapper; + +import java.util.List; +import java.util.HashMap; +import com.zhgd.xmgl.modules.policecamera.entity.WorkTicketOrder; +import com.zhgd.xmgl.modules.policecamera.entity.vo.WorkTicketOrderVo; +import com.zhgd.xmgl.modules.policecamera.entity.dto.WorkTicketOrderDto; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Constants; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: 工作票工单 + * @author： pds + * @date： 2025-09-28 + * @version： V1.0 + */ +@Mapper +public interface WorkTicketOrderMapper extends BaseMapper { + + /** + * 分页列表查询工作票工单信息 + * + * @param page + * @param queryWrapper + * @param param + * @return + */ + IPage queryList(Page page, @Param(Constants.WRAPPER) QueryWrapper queryWrapper, @Param("param") HashMap param); + + /** + * 列表查询工作票工单信息 + * + * @param queryWrapper + * @param param + * @return + */ + List queryList(@Param(Constants.WRAPPER) QueryWrapper queryWrapper, @Param("param") HashMap param); + +} diff --git a/src/main/java/com/zhgd/xmgl/modules/policecamera/mapper/xml/WorkTicketOrderMapper.xml b/src/main/java/com/zhgd/xmgl/modules/policecamera/mapper/xml/WorkTicketOrderMapper.xml new file mode 100644 index 000000000..d069c2c73 --- /dev/null +++ b/src/main/java/com/zhgd/xmgl/modules/policecamera/mapper/xml/WorkTicketOrderMapper.xml @@ -0,0 +1,15 @@ + + + + + diff --git a/src/main/java/com/zhgd/xmgl/modules/policecamera/service/IWorkTicketOrderService.java b/src/main/java/com/zhgd/xmgl/modules/policecamera/service/IWorkTicketOrderService.java new file mode 100644 index 000000000..318b00709 --- /dev/null +++ b/src/main/java/com/zhgd/xmgl/modules/policecamera/service/IWorkTicketOrderService.java @@ -0,0 +1,55 @@ +package com.zhgd.xmgl.modules.policecamera.service; + +import com.zhgd.xmgl.modules.policecamera.entity.WorkTicketOrder; +import com.zhgd.xmgl.modules.policecamera.entity.vo.WorkTicketOrderVo; +import com.zhgd.xmgl.modules.policecamera.entity.dto.WorkTicketOrderDto; +import com.baomidou.mybatisplus.extension.service.IService; +import com.baomidou.mybatisplus.core.metadata.IPage; +import java.util.HashMap; +import java.util.List; + +/** + * @Description: 工作票工单 + * @author： pds + * @date： 2025-09-28 + * @version： V1.0 + */ +public interface IWorkTicketOrderService extends IService { + /** + * 分页列表查询工作票工单信息 + * @param param 参数map + * @return + */ + IPage queryPageList(HashMap param); + /** + * 列表查询工作票工单信息 + * @param param 参数map + * @return + */ + List queryList(HashMap param); + /** + * 添加工作票工单信息 + * @param workTicketOrderDto 工作票工单 + * @return + */ + void add(WorkTicketOrderDto workTicketOrderDto); + /** + * 编辑工作票工单信息 + * @param workTicketOrderDto 工作票工单 + * @return + */ + void edit(WorkTicketOrderDto workTicketOrderDto); + /** + * 根据id删除工作票工单信息 + * @param id 工作票工单的id + * @return + */ + void delete(String id); + /** + * 根据id查询工作票工单信息 + * @param id 工作票工单的id + * @return + */ + WorkTicketOrderVo queryById(String id); + +} diff --git a/src/main/java/com/zhgd/xmgl/modules/policecamera/service/impl/WorkTicketOrderServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/policecamera/service/impl/WorkTicketOrderServiceImpl.java new file mode 100644 index 000000000..3f9a3a5b8 --- /dev/null +++ b/src/main/java/com/zhgd/xmgl/modules/policecamera/service/impl/WorkTicketOrderServiceImpl.java @@ -0,0 +1,95 @@ +package com.zhgd.xmgl.modules.policecamera.service.impl; + +import cn.hutool.core.collection.CollUtil; +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.policecamera.entity.WorkTicketOrder; +import com.zhgd.xmgl.modules.policecamera.entity.dto.WorkTicketOrderDto; +import com.zhgd.xmgl.modules.policecamera.entity.vo.WorkTicketOrderVo; +import com.zhgd.xmgl.modules.policecamera.mapper.WorkTicketOrderMapper; +import com.zhgd.xmgl.modules.policecamera.service.IWorkTicketOrderService; +import com.zhgd.xmgl.util.MapBuilder; +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.HashMap; +import java.util.List; + +/** + * @Description: 工作票工单 + * @author： pds + * @date： 2025-09-28 + * @version： V1.0 + */ +@Service +public class WorkTicketOrderServiceImpl extends ServiceImpl implements IWorkTicketOrderService { + @Autowired + private WorkTicketOrderMapper workTicketOrderMapper; + @Override + public IPage queryPageList(HashMap param) { + QueryWrapper queryWrapper = this.getQueryWrapper(param); + Page page = PageUtil.getPage(param); + IPage pageList = baseMapper.queryList(page, queryWrapper,param); + pageList.setRecords(this.dealList(pageList.getRecords())); + return pageList; + } + + @Override + public List queryList(HashMap param) { + QueryWrapper queryWrapper = getQueryWrapper(param); + return dealList(baseMapper.queryList(queryWrapper,param)); + } + + private QueryWrapper getQueryWrapper(HashMap param) { + QueryWrapper queryWrapper = QueryGenerator.initPageQueryWrapper(WorkTicketOrderVo.class, param, true); + queryWrapper.orderByDesc(RefUtil.fieldNameUlc(WorkTicketOrderVo::getId)); + return queryWrapper; + } + + private List dealList(List list) { + return list; + } + + @Override + public void add(WorkTicketOrderDto workTicketOrderDto) { + workTicketOrderDto.setId(null); + baseMapper.insert(workTicketOrderDto); + } + + @Override + public void edit(WorkTicketOrderDto workTicketOrderDto) { + WorkTicketOrder oldWorkTicketOrder = baseMapper.selectById(workTicketOrderDto.getId()); + if(oldWorkTicketOrder==null) { + throw new OpenAlertException("未找到对应实体"); + } + baseMapper.updateById(workTicketOrderDto); + } + + @Override + public void delete(String id) { + WorkTicketOrder workTicketOrder = baseMapper.selectById(id); + if(workTicketOrder==null) { + throw new OpenAlertException("未找到对应实体"); + } + baseMapper.deleteById(id); + } + + @Override + public WorkTicketOrderVo queryById(String id) { + List list = this.queryList(new MapBuilder() + .put("id", id) + .build()); + WorkTicketOrderVo entity = CollUtil.getFirst(list); + if (entity == null) { + throw new OpenAlertException("未找到对应实体"); + } + return entity; + } + +} diff --git a/src/main/java/com/zhgd/xmgl/modules/policecamera/service/impl/WorkTicketServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/policecamera/service/impl/WorkTicketServiceImpl.java index d628fd825..2de06e3e2 100644 --- a/src/main/java/com/zhgd/xmgl/modules/policecamera/service/impl/WorkTicketServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/policecamera/service/impl/WorkTicketServiceImpl.java @@ -4,6 +4,7 @@ import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -12,10 +13,7 @@ import com.zhgd.jeecg.common.system.query.QueryGenerator; import com.zhgd.xmgl.call.api.PoliceCameraManufacturer; import com.zhgd.xmgl.call.factory.PoliceCameraManufacturerFactory; import com.zhgd.xmgl.modules.basicdata.service.ISystemUserService; -import com.zhgd.xmgl.modules.policecamera.entity.PoliceCameraItem; -import com.zhgd.xmgl.modules.policecamera.entity.WorkTicket; -import com.zhgd.xmgl.modules.policecamera.entity.WorkTicketCameraRel; -import com.zhgd.xmgl.modules.policecamera.entity.WorkTicketHistory; +import com.zhgd.xmgl.modules.policecamera.entity.*; import com.zhgd.xmgl.modules.policecamera.entity.dto.OperateWorkTicketDto; import com.zhgd.xmgl.modules.policecamera.entity.dto.WorkTicketDto; import com.zhgd.xmgl.modules.policecamera.entity.vo.CountWorkTicketVo; @@ -85,6 +83,9 @@ public class WorkTicketServiceImpl extends ServiceImpl queryPageList(HashMap param) { @@ -261,6 +262,28 @@ public class WorkTicketServiceImpl extends ServiceImpl() + .set(WorkTicketOrder::getStatus, 3) + .eq(WorkTicketOrder::getHistoryId, his.getId()) + ); + } } } diff --git a/src/main/java/com/zhgd/xmgl/modules/project/controller/ProjectVideoConfigController.java b/src/main/java/com/zhgd/xmgl/modules/project/controller/ProjectVideoConfigController.java index 44e31674d..94cc737ae 100644 --- a/src/main/java/com/zhgd/xmgl/modules/project/controller/ProjectVideoConfigController.java +++ b/src/main/java/com/zhgd/xmgl/modules/project/controller/ProjectVideoConfigController.java @@ -1,9 +1,12 @@ package com.zhgd.xmgl.modules.project.controller; +import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.util.StrUtil; import com.zhgd.annotation.OperLog; import com.zhgd.jeecg.common.api.vo.Result; import com.zhgd.redis.annotation.ApiIdempotent; import com.zhgd.xmgl.modules.project.entity.ProjectVideoConfig; +import com.zhgd.xmgl.modules.project.entity.dto.ProjectVideoConfigDto; import com.zhgd.xmgl.modules.project.service.IProjectVideoConfigService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; @@ -51,14 +54,19 @@ public class ProjectVideoConfigController { /** * 编辑 - * @param projectVideoConfig + * @param dto * @return */ @ApiIdempotent @OperLog(operModul = "视频管理",operType = "编辑视频配置信息",operDesc = "编辑视频配置信息") @ApiOperation(value = "编辑视频配置信息", notes = "编辑视频配置信息" , httpMethod="POST") @PostMapping(value = "/edit") - public Result editProjectVideoConfig(@RequestBody ProjectVideoConfig projectVideoConfig) { + public Result editProjectVideoConfig(@RequestBody ProjectVideoConfigDto dto) { + ProjectVideoConfig projectVideoConfig = new ProjectVideoConfig(); + BeanUtil.copyProperties(dto, projectVideoConfig); + if (StrUtil.isNotBlank(dto.getPort())) { + projectVideoConfig.setPassword(dto.getPort()); + } projectVideoConfigService.editProjectVideoConfig(projectVideoConfig); return Result.ok(); } diff --git a/src/main/java/com/zhgd/xmgl/modules/project/entity/dto/ProjectVideoConfigDto.java b/src/main/java/com/zhgd/xmgl/modules/project/entity/dto/ProjectVideoConfigDto.java new file mode 100644 index 000000000..9f9cf58f5 --- /dev/null +++ b/src/main/java/com/zhgd/xmgl/modules/project/entity/dto/ProjectVideoConfigDto.java @@ -0,0 +1,14 @@ +package com.zhgd.xmgl.modules.project.entity.dto; + +import com.zhgd.xmgl.modules.project.entity.ProjectVideoConfig; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +public class ProjectVideoConfigDto extends ProjectVideoConfig { + /** + * 端口替换password字段 + */ + @ApiModelProperty(value = "端口替换password字段") + private java.lang.String port; +} diff --git a/src/main/java/com/zhgd/xmgl/modules/video/entity/vo/VideoGroupVo.java b/src/main/java/com/zhgd/xmgl/modules/video/entity/vo/VideoGroupVo.java index 0be297432..5e0fa3178 100644 --- a/src/main/java/com/zhgd/xmgl/modules/video/entity/vo/VideoGroupVo.java +++ b/src/main/java/com/zhgd/xmgl/modules/video/entity/vo/VideoGroupVo.java @@ -6,6 +6,6 @@ import lombok.Data; @Data public class VideoGroupVo extends VideoGroup { - @ApiModelProperty("摄像头数量") + @ApiModelProperty("该分组的摄像头数量（不包含下级分组的摄像头数量）") private Integer totalNum; } diff --git a/src/main/java/com/zhgd/xmgl/modules/video/mapper/xml/VideoItemMapper.xml b/src/main/java/com/zhgd/xmgl/modules/video/mapper/xml/VideoItemMapper.xml index 10ddd2c28..90b8ea699 100644 --- a/src/main/java/com/zhgd/xmgl/modules/video/mapper/xml/VideoItemMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/video/mapper/xml/VideoItemMapper.xml @@ -26,7 +26,7 @@ and vi.group_id = #{groupId} - and vi.video_name = #{videoName} + and vi.video_name like CONCAT(CONCAT('%', #{videoName}), '%') and vi.item_id in diff --git a/src/main/java/com/zhgd/xmgl/modules/video/service/impl/VideoGroupServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/video/service/impl/VideoGroupServiceImpl.java index 2d8570151..6a5d69ed8 100644 --- a/src/main/java/com/zhgd/xmgl/modules/video/service/impl/VideoGroupServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/video/service/impl/VideoGroupServiceImpl.java @@ -132,7 +132,7 @@ public class VideoGroupServiceImpl extends ServiceImpl cityIdMap = systemCities.stream().collect(Collectors.toMap(e -> e.getCityid(), Function.identity(), (o, o2) -> o)); - HashMap result = null; + Map result = null; try { Map param = new HashMap<>(16); param.put("appid", tianqiAppid); @@ -261,6 +262,25 @@ public class AqiUtil { result = JSON.parseObject(rs, HashMap.class); } catch (Exception e) { log.error("error：", e); + result = JSON.parseObject("{\n" + + " \"date\": \"" + DateUtil.today() + "\",\n" + + " \"tem_day\": \"32\",\n" + + " \"win_meter\": \"3km/h\",\n" + + " \"week\": \"" + DateUtil.thisDayOfWeekEnum().toChinese() + "\",\n" + + " \"city\": \"深圳\",\n" + + " \"tem_night\": \"27\",\n" + + " \"cityid\": \"101280601\",\n" + + " \"air\": \"22\",\n" + + " \"pressure\": \"1005\",\n" + + " \"update_time\": \"17:05\",\n" + + " \"wea\": \"多云\",\n" + + " \"wea_img\": \"yun\",\n" + + " \"win_speed\": \"1级\",\n" + + " \"humidity\": \"65%\",\n" + + " \"tem\": \"29.6\",\n" + + " \"win\": \"东风\",\n" + + " \"nums\": 50\n" + + " }",HashMap.class); } redisRepository.set(key, result, 60 * 60L); return result;