From f7e473f469fb35d4a6edc63c5df91b819d3d9b5c Mon Sep 17 00:00:00 2001 From: zhanghua <314079846@qq.com> Date: 星期一, 31 十月 2022 18:00:54 +0800 Subject: [PATCH] 手持设备和音柱 --- ycl-platform/src/main/java/com/ycl/controller/epuipment/HandheldTerminalController.java | 66 +++++++ ycl-platform/src/main/java/com/ycl/entity/equipment/HandheldTerminal.java | 72 ++++++++ ycl-platform/src/main/java/com/ycl/service/equipment/impl/LoudspeakerServiceImpl.java | 19 ++ ycl-platform/src/main/java/com/ycl/vo/equipment/HandheldTerminalVo.java | 10 + ycl-platform/src/main/java/com/ycl/mapper/equipment/LoudspeakerMapper.java | 16 + ycl-platform/src/main/java/com/ycl/service/equipment/IHandheldTerminalService.java | 18 ++ ycl-platform/src/main/java/com/ycl/service/equipment/ILoudspeakerService.java | 16 + ycl-platform/src/main/java/com/ycl/entity/equipment/Loudspeaker.java | 85 +++++++++ document/综合行政执法文书参考样式.docx | 0 ycl-platform/src/main/resources/mapper/equipment/HandheldTerminalMapper.xml | 41 ++++ ycl-platform/src/main/resources/mapper/equipment/LoudspeakerMapper.xml | 25 ++ ycl-platform/src/main/java/com/ycl/mapper/equipment/HandheldTerminalMapper.java | 20 ++ ycl-platform/src/main/java/com/ycl/controller/epuipment/LoudspeakerController.java | 81 +++++++++ ycl-platform/src/main/java/com/ycl/service/equipment/impl/HandheldTerminalServiceImpl.java | 27 +++ 14 files changed, 496 insertions(+), 0 deletions(-) diff --git "a/document/\347\273\274\345\220\210\350\241\214\346\224\277\346\211\247\346\263\225\346\226\207\344\271\246\345\217\202\350\200\203\346\240\267\345\274\217.docx" "b/document/\347\273\274\345\220\210\350\241\214\346\224\277\346\211\247\346\263\225\346\226\207\344\271\246\345\217\202\350\200\203\346\240\267\345\274\217.docx" new file mode 100644 index 0000000..e3843da --- /dev/null +++ "b/document/\347\273\274\345\220\210\350\241\214\346\224\277\346\211\247\346\263\225\346\226\207\344\271\246\345\217\202\350\200\203\346\240\267\345\274\217.docx" Binary files differ diff --git a/ycl-platform/src/main/java/com/ycl/controller/epuipment/HandheldTerminalController.java b/ycl-platform/src/main/java/com/ycl/controller/epuipment/HandheldTerminalController.java new file mode 100644 index 0000000..5c68bca --- /dev/null +++ b/ycl-platform/src/main/java/com/ycl/controller/epuipment/HandheldTerminalController.java @@ -0,0 +1,66 @@ +package com.ycl.controller.epuipment; + + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.ycl.annotation.LogSave; +import com.ycl.api.CommonResult; +import com.ycl.controller.BaseController; +import com.ycl.vo.equipment.HandheldTerminalVo; +import com.ycl.entity.equipment.HandheldTerminal; +import com.ycl.service.equipment.IHandheldTerminalService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + + +/** + * 鎵嬫寔璁惧绠$悊 + * + * @version V1.0 + * @author: AI + * @date: 2022-10-31 15:44 + **/ +@RestController +@RequestMapping("/equipment_handheld_terminal") +@Api(tags = "鎵嬫寔璁惧绠$悊") +public class HandheldTerminalController extends BaseController { + + IHandheldTerminalService handheldTerminalService; + + @Autowired + public void setHandheldTerminalService(IHandheldTerminalService handheldTerminalService) { + this.handheldTerminalService = handheldTerminalService; + } + + @GetMapping("/query") + @ApiOperation("鏌ヨ") + @LogSave + public CommonResult<Page<HandheldTerminalVo>> search(@RequestParam(required = false) Integer size, + @RequestParam(required = false) Integer current, + @RequestParam(required = false) Short state) { + return CommonResult.success(handheldTerminalService.search(size, current, state)); + } + + @PostMapping("/add") + @ApiOperation("娣诲姞") + @LogSave(operationType = "鎵嬫寔璁惧绠$悊", contain = "娣诲姞鎵嬫寔璁惧") + public CommonResult add(@RequestBody HandheldTerminal handheldTerminal) { + return CommonResult.success(null); + } + + @PutMapping("/update") + @ApiOperation("淇敼") + @LogSave(operationType = "鎵嬫寔璁惧绠$悊", contain = "淇敼鎵嬫寔璁惧") + public CommonResult update(@RequestBody HandheldTerminal handheldTerminal) { + return CommonResult.success(null); + } + + @DeleteMapping("/delete/{id}") + @ApiOperation("鍒犻櫎") + @LogSave(operationType = "鎵嬫寔璁惧绠$悊", contain = "鍒犻櫎鎵嬫寔璁惧") + public CommonResult delete(@PathVariable Long id) { + return CommonResult.success(null); + } + +} diff --git a/ycl-platform/src/main/java/com/ycl/controller/epuipment/LoudspeakerController.java b/ycl-platform/src/main/java/com/ycl/controller/epuipment/LoudspeakerController.java new file mode 100644 index 0000000..68b6cee --- /dev/null +++ b/ycl-platform/src/main/java/com/ycl/controller/epuipment/LoudspeakerController.java @@ -0,0 +1,81 @@ +package com.ycl.controller.epuipment; + + +import com.alibaba.excel.EasyExcel; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.ycl.annotation.LogSave; +import com.ycl.api.CommonResult; +import com.ycl.controller.BaseController; +import com.ycl.entity.dict.DataDictionary; +import com.ycl.entity.equipment.EquipmentBayonet; +import com.ycl.entity.equipment.Loudspeaker; +import com.ycl.service.dict.IDataDictionaryService; +import com.ycl.service.equipment.IEquipmentBayonetService; +import com.ycl.service.equipment.ILoudspeakerService; +import com.ycl.vo.equipment.EquipmentBayonetVO; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.SneakyThrows; +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.BeanUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import java.time.LocalDateTime; +import java.time.format.DateTimeFormatter; +import java.util.stream.Collectors; + + +/** + * 闊虫煴绠$悊 + * + * @version V1.0 + * @author: AI + * @date: 2022-10-31 15:45 + **/ +@RestController +@RequestMapping("/equipment_loudspeaker") +@Api(tags = "闊虫煴绠$悊") +public class LoudspeakerController extends BaseController { + + ILoudspeakerService loudspeakerService; + + @Autowired + public void setLoudspeakerService(ILoudspeakerService loudspeakerService) { + this.loudspeakerService = loudspeakerService; + } + + @GetMapping("/query") + @ApiOperation("鏌ヨ") + @LogSave + public CommonResult search(@RequestParam(required = false) Integer size, + @RequestParam(required = false) Integer current, + @RequestParam(required = false) Short state) { + return null; + } + + @PostMapping("/add") + @ApiOperation("娣诲姞") + @LogSave(operationType = "闊虫煴绠$悊", contain = "娣诲姞闊虫煴") + public CommonResult add(@RequestBody Loudspeaker loudspeaker) { + return CommonResult.success(null); + } + + @PutMapping("/update") + @ApiOperation("缂栬緫") + @LogSave(operationType = "闊虫煴绠$悊", contain = "淇敼闊虫煴") + public CommonResult update(@RequestBody Loudspeaker loudspeaker) { + return CommonResult.success(null); + } + + @DeleteMapping("/delete/{id}") + @ApiOperation("鍒犻櫎") + @LogSave(operationType = "闊虫煴绠$悊", contain = "鍒犻櫎闊虫煴") + public CommonResult delete(@PathVariable Long id) { + return CommonResult.success(null); + } + + +} diff --git a/ycl-platform/src/main/java/com/ycl/entity/equipment/HandheldTerminal.java b/ycl-platform/src/main/java/com/ycl/entity/equipment/HandheldTerminal.java new file mode 100644 index 0000000..4332ba6 --- /dev/null +++ b/ycl-platform/src/main/java/com/ycl/entity/equipment/HandheldTerminal.java @@ -0,0 +1,72 @@ +package com.ycl.entity.equipment; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.io.Serializable; +import java.time.LocalDateTime; + + +/** + * 鎵嬫寔缁堢 + * + * @version V1.0 + * @author: AI + * @date: 2022-10-31 14:55 + **/ +@Data +@EqualsAndHashCode(callSuper = false) +@TableName("ums_equipment_handheld_terminal") +public class HandheldTerminal implements Serializable { + /** + * 涓婚敭 + */ + @TableId(value = "id", type = IdType.AUTO) + private Integer id; + + /** + * 鍚嶇О + */ + @TableField("name") + private String name; + + /** + * 缂栧彿 + */ + @TableField("code") + private String code; + + /** + * 浣跨敤浜� + */ + @TableField("user") + private String user; + + /** + * 鑱旂郴鏂瑰紡 + */ + @TableField("phone") + private String phone; + + /** + * 閮ㄩ棬id + */ + @TableField("depart_id") + private Integer departId; + + /** + * 鐘舵��1鍦ㄧ嚎0绂荤嚎 + */ + @TableField("state") + private Short state; + + /** + * 鍒涘缓鏃堕棿 + */ + @TableField("create_time") + private LocalDateTime createTime; +} diff --git a/ycl-platform/src/main/java/com/ycl/entity/equipment/Loudspeaker.java b/ycl-platform/src/main/java/com/ycl/entity/equipment/Loudspeaker.java new file mode 100644 index 0000000..3bb5ef8 --- /dev/null +++ b/ycl-platform/src/main/java/com/ycl/entity/equipment/Loudspeaker.java @@ -0,0 +1,85 @@ +package com.ycl.entity.equipment; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.io.Serializable; +import java.time.LocalDateTime; + + +/** + * 闊虫煴 + * + * @version V1.0 + * @author: AI + * @date: 2022-10-31 14:55 + **/ +@Data +@EqualsAndHashCode(callSuper = false) +@TableName("ums_equipment_loudspeaker") +public class Loudspeaker implements Serializable { + /** + * 涓婚敭 + */ + @TableId(value = "id", type = IdType.AUTO) + private Integer id; + + /** + * 鍚嶇О + */ + @TableField("name") + private String name; + + /** + * 缂栧彿 + */ + @TableField("code") + private String code; + + /** + * 鍔熺巼 + */ + @TableField("power") + private String power; + + /** + * 棰戠巼鍝嶅簲 + */ + @TableField("frequency_response") + private String frequencyResponse; + + /** + * 鍠囧彮鍗曞厓 + */ + @TableField("full_range_speaker") + private String fullRangeSpeaker; + + /** + * 缁忓害 + */ + @TableField("longitude") + private Double longitude; + + /** + * 绾害 + */ + @TableField("latitude") + private Double latitude; + + + /** + * 鐘舵��1鍦ㄧ嚎0绂荤嚎 + */ + @TableField("state") + private Short state; + + /** + * 鍒涘缓鏃堕棿 + */ + @TableField("create_time") + private LocalDateTime createTime; +} diff --git a/ycl-platform/src/main/java/com/ycl/mapper/equipment/HandheldTerminalMapper.java b/ycl-platform/src/main/java/com/ycl/mapper/equipment/HandheldTerminalMapper.java new file mode 100644 index 0000000..996116f --- /dev/null +++ b/ycl-platform/src/main/java/com/ycl/mapper/equipment/HandheldTerminalMapper.java @@ -0,0 +1,20 @@ +package com.ycl.mapper.equipment; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.ycl.vo.equipment.HandheldTerminalVo; +import com.ycl.entity.equipment.HandheldTerminal; +import org.apache.ibatis.annotations.Param; + +/** + * <p> + * 鎵嬫寔璁惧绠$悊 Mapper 鎺ュ彛 + * </p> + * + * @author zhanghua + * @since 2022-10-14 + */ +public interface HandheldTerminalMapper extends BaseMapper<HandheldTerminal> { + + Page<HandheldTerminalVo> search(Page<HandheldTerminalVo> page, @Param("state") Short state); +} diff --git a/ycl-platform/src/main/java/com/ycl/mapper/equipment/LoudspeakerMapper.java b/ycl-platform/src/main/java/com/ycl/mapper/equipment/LoudspeakerMapper.java new file mode 100644 index 0000000..8f68ccd --- /dev/null +++ b/ycl-platform/src/main/java/com/ycl/mapper/equipment/LoudspeakerMapper.java @@ -0,0 +1,16 @@ +package com.ycl.mapper.equipment; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.ycl.entity.equipment.Loudspeaker; + +/** + * <p> + * 闊虫煴绠$悊 Mapper 鎺ュ彛 + * </p> + * + * @author zhanghua + * @since 2022-10-14 + */ +public interface LoudspeakerMapper extends BaseMapper<Loudspeaker> { + +} diff --git a/ycl-platform/src/main/java/com/ycl/service/equipment/IHandheldTerminalService.java b/ycl-platform/src/main/java/com/ycl/service/equipment/IHandheldTerminalService.java new file mode 100644 index 0000000..5c05252 --- /dev/null +++ b/ycl-platform/src/main/java/com/ycl/service/equipment/IHandheldTerminalService.java @@ -0,0 +1,18 @@ +package com.ycl.service.equipment; + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.IService; +import com.ycl.vo.equipment.HandheldTerminalVo; +import com.ycl.entity.equipment.HandheldTerminal; + +/** + * <p> + * 鎵嬫寔璁惧绠$悊 鏈嶅姟绫� + * </p> + * + * @author zhanghua + * @since 2022-10-14 + */ +public interface IHandheldTerminalService extends IService<HandheldTerminal> { + Page<HandheldTerminalVo> search(Integer size, Integer current, Short state); +} diff --git a/ycl-platform/src/main/java/com/ycl/service/equipment/ILoudspeakerService.java b/ycl-platform/src/main/java/com/ycl/service/equipment/ILoudspeakerService.java new file mode 100644 index 0000000..c30eff8 --- /dev/null +++ b/ycl-platform/src/main/java/com/ycl/service/equipment/ILoudspeakerService.java @@ -0,0 +1,16 @@ +package com.ycl.service.equipment; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.ycl.entity.equipment.EquipmentBayonet; +import com.ycl.entity.equipment.Loudspeaker; + +/** + * <p> + * 闊虫煴绠$悊 鏈嶅姟绫� + * </p> + * + * @author zhanghua + * @since 2022-10-14 + */ +public interface ILoudspeakerService extends IService<Loudspeaker> { +} diff --git a/ycl-platform/src/main/java/com/ycl/service/equipment/impl/HandheldTerminalServiceImpl.java b/ycl-platform/src/main/java/com/ycl/service/equipment/impl/HandheldTerminalServiceImpl.java new file mode 100644 index 0000000..3c9090c --- /dev/null +++ b/ycl-platform/src/main/java/com/ycl/service/equipment/impl/HandheldTerminalServiceImpl.java @@ -0,0 +1,27 @@ +package com.ycl.service.equipment.impl; + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.ycl.vo.equipment.HandheldTerminalVo; +import com.ycl.entity.equipment.HandheldTerminal; +import com.ycl.mapper.equipment.HandheldTerminalMapper; +import com.ycl.service.equipment.IHandheldTerminalService; +import org.springframework.stereotype.Service; + +/** + * <p> + * 鎵嬫寔璁惧绠$悊 鏈嶅姟瀹炵幇绫� + * </p> + * + * @author zhanghua + * @since 2022-10-14 + */ +@Service +public class HandheldTerminalServiceImpl extends ServiceImpl<HandheldTerminalMapper, HandheldTerminal> implements IHandheldTerminalService { + @Override + public Page<HandheldTerminalVo> search(Integer size, Integer current, Short state) { + Page<HandheldTerminalVo> page = new Page<>(size, current); + page = baseMapper.search(page, state); + return page; + } +} diff --git a/ycl-platform/src/main/java/com/ycl/service/equipment/impl/LoudspeakerServiceImpl.java b/ycl-platform/src/main/java/com/ycl/service/equipment/impl/LoudspeakerServiceImpl.java new file mode 100644 index 0000000..015efdc --- /dev/null +++ b/ycl-platform/src/main/java/com/ycl/service/equipment/impl/LoudspeakerServiceImpl.java @@ -0,0 +1,19 @@ +package com.ycl.service.equipment.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.ycl.entity.equipment.Loudspeaker; +import com.ycl.mapper.equipment.LoudspeakerMapper; +import com.ycl.service.equipment.ILoudspeakerService; +import org.springframework.stereotype.Service; + +/** + * <p> + * 闊虫煴绠$悊 鏈嶅姟瀹炵幇绫� + * </p> + * + * @author zhanghua + * @since 2022-10-14 + */ +@Service +public class LoudspeakerServiceImpl extends ServiceImpl<LoudspeakerMapper, Loudspeaker> implements ILoudspeakerService { +} diff --git a/ycl-platform/src/main/java/com/ycl/vo/equipment/HandheldTerminalVo.java b/ycl-platform/src/main/java/com/ycl/vo/equipment/HandheldTerminalVo.java new file mode 100644 index 0000000..f431a91 --- /dev/null +++ b/ycl-platform/src/main/java/com/ycl/vo/equipment/HandheldTerminalVo.java @@ -0,0 +1,10 @@ +package com.ycl.vo.equipment; + +import com.ycl.entity.equipment.HandheldTerminal; +import lombok.Data; + +@Data +public class HandheldTerminalVo extends HandheldTerminal { + private String departName; + private String pDepartName; +} diff --git a/ycl-platform/src/main/resources/mapper/equipment/HandheldTerminalMapper.xml b/ycl-platform/src/main/resources/mapper/equipment/HandheldTerminalMapper.xml new file mode 100644 index 0000000..a140cfb --- /dev/null +++ b/ycl-platform/src/main/resources/mapper/equipment/HandheldTerminalMapper.xml @@ -0,0 +1,41 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> +<mapper namespace="com.ycl.mapper.equipment.HandheldTerminalMapper"> + + <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 --> + <resultMap id="BaseResultMap" type="com.ycl.entity.equipment.HandheldTerminal"> + <id column="id" property="id" jdbcType="INTEGER"/> + <result column="name" property="name" jdbcType="VARCHAR"/> + <result column="code" property="code" jdbcType="VARCHAR"/> + <result column="user" property="user" jdbcType="VARCHAR"/> + <result column="phone" property="phone" jdbcType="VARCHAR"/> + <result column="depart_id" property="departId" jdbcType="INTEGER"/> + <result column="state" property="state" jdbcType="INTEGER"/> + <result column="create_time" property="createTime" jdbcType="TIMESTAMP"/> + </resultMap> + + <!-- 閫氱敤鏌ヨ缁撴灉鍒� --> + <sql id="Base_Column_List"> + id + ,name,code,user,phone,depart_id,state,create_time + </sql> + + <resultMap id="VoMap" type="com.ycl.vo.equipment.HandheldTerminalVo"> + <result column="depart_name" property="departName" jdbcType="VARCHAR"/> + <result column="p_depart_name" property="pDepartName" jdbcType="VARCHAR"/> + </resultMap> + <select id="search" resultMap="VoMap"> + SELECT ht.*,IF(p.depart_name is null ,'',d.depart_name) depart_name,IFNULL(p.depart_name,d.depart_name) + p_depart_name + FROM ums_equipment_handheld_terminal ht + LEFT JOIN ums_depart d on ht.depart_id = d.id + LEFT JOIN ums_depart p on d.parent_id = p.id + <where> + <if test="state!=null"> + ht.state = #{carNum} + </if> + </where> + order by ht.id desc + </select> + +</mapper> diff --git a/ycl-platform/src/main/resources/mapper/equipment/LoudspeakerMapper.xml b/ycl-platform/src/main/resources/mapper/equipment/LoudspeakerMapper.xml new file mode 100644 index 0000000..b201d5c --- /dev/null +++ b/ycl-platform/src/main/resources/mapper/equipment/LoudspeakerMapper.xml @@ -0,0 +1,25 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> +<mapper namespace="com.ycl.mapper.equipment.LoudspeakerMapper"> + + <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 --> + <resultMap id="BaseResultMap" type="com.ycl.entity.equipment.Loudspeaker"> + <id column="id" property="id" jdbcType="INTEGER"/> + <result column="name" property="name" jdbcType="VARCHAR"/> + <result column="code" property="code" jdbcType="VARCHAR"/> + <result column="power" property="power" jdbcType="VARCHAR"/> + <result column="frequency_response" property="frequencyResponse" jdbcType="VARCHAR"/> + <result column="full_range_speaker" property="fullRangeSpeaker" jdbcType="VARCHAR"/> + <result column="longitude" property="longitude" jdbcType="FLOAT"/> + <result column="latitude" property="latitude" jdbcType="FLOAT"/> + <result column="state" property="state" jdbcType="INTEGER"/> + <result column="create_time" property="createTime" jdbcType="TIMESTAMP"/> + </resultMap> + + <!-- 閫氱敤鏌ヨ缁撴灉鍒� --> + <sql id="Base_Column_List"> + id + ,name,code,power,frequency_response,full_range_speaker,longitude,latitude,state,create_time + </sql> + +</mapper> -- Gitblit v1.8.0