From 84e920b9f7a80b05c2f9197ab9e64f1fba86a491 Mon Sep 17 00:00:00 2001 From: wl <173@qq.com> Date: 星期二, 15 十一月 2022 10:08:42 +0800 Subject: [PATCH] 文书管理和操作日志添加 --- ycl-platform/pom.xml | 6 ycl-generator/src/main/java/com/ycl/entity/writ/Writ.java | 136 ++++++++++ ycl-generator/src/main/resources/mapper/writ/WritMapper.xml | 32 ++ ycl-generator/src/main/resources/mapper/writ/WritTemplateMapper.xml | 17 + ycl-platform/src/main/java/com/ycl/entity/caseHandler/Writ.java | 6 ycl-platform/src/main/java/com/ycl/entity/writ/WritRecord.java | 71 +++++ ycl-generator/src/main/java/com/ycl/mapper/writ/WritMapper.java | 16 + ycl-platform/src/main/java/com/ycl/service/impl/WritTemplateServiceImpl.java | 20 + ycl-platform/src/main/resources/mapper/writ/WritTemplateMapper.xml | 17 + ycl-generator/src/main/java/com/ycl/service/writ/impl/WritTemplateServiceImpl.java | 20 + ycl-generator/src/main/java/com/ycl/controller/writ/WritController.java | 8 ycl-platform/src/main/java/com/ycl/service/writ/impl/WritTemplateServiceImpl.java | 20 + ycl-generator/src/main/java/com/ycl/controller/writ/WritTemplateController.java | 25 + ycl-platform/src/main/java/com/ycl/controller/resources/VideoResourcesController.java | 1 ycl-platform/src/main/java/com/ycl/service/impl/WritServiceImpl.java | 19 + ycl-platform/src/main/java/com/ycl/controller/message/MessageController.java | 6 ycl-platform/src/main/java/com/ycl/entity/writ/WritTemplate.java | 46 +++ ycl-generator/src/main/java/com/ycl/entity/writ/WritTemplate.java | 46 +++ ycl-platform/src/main/java/com/ycl/mapper/writ/WritTemplateMapper.java | 16 + ycl-platform/src/main/java/com/ycl/service/writ/IWritTemplateService.java | 16 + ycl-platform/src/main/java/com/ycl/dto/dispatch/UploadDisposingResultParam.java | 7 ycl-platform/src/main/java/com/ycl/controller/video/VideoPointController.java | 5 ycl-generator/src/main/java/com/ycl/mapper/writ/WritTemplateMapper.java | 16 + ycl-platform/src/main/java/com/ycl/controller/resources/ImageResourcesController.java | 1 ycl-platform/src/main/java/com/ycl/controller/writ/WritController.java | 65 +++++ ycl-generator/src/main/java/com/ycl/service/writ/IWritTemplateService.java | 16 + ycl-platform/src/main/java/com/ycl/controller/writ/WritTemplateController.java | 45 +++ ycl-platform/src/main/java/com/ycl/controller/portal/UmsWebsitePortalController.java | 6 ycl-platform/src/main/java/com/ycl/controller/epuipment/EquipmentBayonetController.java | 2 ycl-platform/src/main/java/com/ycl/controller/store/StoreInfoController.java | 5 ycl-generator/src/main/java/com/ycl/service/writ/impl/WritServiceImpl.java | 20 + ycl-platform/src/main/java/com/ycl/controller/caseHandler/DisposeRecordController.java | 2 32 files changed, 729 insertions(+), 5 deletions(-) diff --git a/ycl-platform/src/main/java/com/ycl/controller/caseHandler/WritController.java b/ycl-generator/src/main/java/com/ycl/controller/writ/WritController.java similarity index 71% rename from ycl-platform/src/main/java/com/ycl/controller/caseHandler/WritController.java rename to ycl-generator/src/main/java/com/ycl/controller/writ/WritController.java index 35ae403..829c8ff 100644 --- a/ycl-platform/src/main/java/com/ycl/controller/caseHandler/WritController.java +++ b/ycl-generator/src/main/java/com/ycl/controller/writ/WritController.java @@ -1,18 +1,18 @@ -package com.ycl.controller.caseHandler; +package com.ycl.controller.writ; -import com.ycl.controller.BaseController; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import com.ycl.base.BaseController; /** * <p> * 鏂囦功绉嶇被 鍙拡瀵硅繚寤� 鍓嶇鎺у埗鍣� * </p> * - * @author wl - * @since 2022-09-24 + * @author lyq + * @since 2022-11-15 */ @RestController @RequestMapping("/writ") diff --git a/ycl-generator/src/main/java/com/ycl/controller/writ/WritTemplateController.java b/ycl-generator/src/main/java/com/ycl/controller/writ/WritTemplateController.java new file mode 100644 index 0000000..572c025 --- /dev/null +++ b/ycl-generator/src/main/java/com/ycl/controller/writ/WritTemplateController.java @@ -0,0 +1,25 @@ +package com.ycl.controller.writ; + + +import com.ycl.base.BaseController; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + * <p> + * 鏂囦功妯℃澘琛� 鍓嶇鎺у埗鍣� + * </p> + * + * @author lyq + * @since 2022-11-14 + */ +@RestController +@RequestMapping("/writ_template") +@Api(tags = "鏂囦功妯℃澘绠$悊") +public class WritTemplateController extends BaseController { + + +} diff --git a/ycl-generator/src/main/java/com/ycl/entity/writ/Writ.java b/ycl-generator/src/main/java/com/ycl/entity/writ/Writ.java new file mode 100644 index 0000000..c04ba5c --- /dev/null +++ b/ycl-generator/src/main/java/com/ycl/entity/writ/Writ.java @@ -0,0 +1,136 @@ +package com.ycl.entity.writ; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.Version; +import com.baomidou.mybatisplus.annotation.TableId; +import java.time.LocalDateTime; +import com.baomidou.mybatisplus.annotation.TableField; +import java.io.Serializable; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * <p> + * 鏂囦功绉嶇被 鍙拡瀵硅繚寤� + * </p> + * + * @author lyq + * @since 2022-11-15 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@TableName("ums_writ") +public class Writ implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 妗堜欢id(鍚寀ms_base_case琛╥d) + */ + @TableId("base_case_id") + private Integer baseCaseId; + + /** + * 杩濆缓id + */ + @TableField("illegal_building_id") + private Integer illegalBuildingId; + + /** + * 鏂囦功绉嶇被 + */ + @TableField("writ_type") + private Integer writType; + + /** + * 鏂囦功缂栧彿 + */ + @TableField("writ_code") + private String writCode; + + /** + * 杩濇硶绫诲瀷 + */ + @TableField("illegal_type") + private Integer illegalType; + + /** + * 鏂囦功鍙戞斁鏃堕棿 + */ + @TableField("send_time") + private LocalDateTime sendTime; + + /** + * 鏂囦功闄愬畾鏃堕棿 + */ + @TableField("limit_time") + private LocalDateTime limitTime; + + /** + * 鏂囦功鍙戞斁鍐呭 + */ + @TableField("send_content") + private String sendContent; + + /** + * 瀹為檯鏁存敼鏃堕棿 + */ + @TableField("rectify_time") + private LocalDateTime rectifyTime; + + /** + * 鏁存敼鎯呭喌 + */ + @TableField("rectify_situation") + private String rectifySituation; + + /** + * 澶囨敞 + */ + @TableField("remark") + private String remark; + + /** + * 鏂囦功鐓х墖涓婁紶 + */ + @TableField("writ_pic") + private String writPic; + + /** + * 鏁存敼鍓嶇収鐗� + */ + @TableField("original_pic") + private String originalPic; + + /** + * 鏁存敼鍚庣収鐗� + */ + @TableField("rectified_pic") + private String rectifiedPic; + + /** + * 鍏朵粬鐓х墖 + */ + @TableField("other_pic") + private String otherPic; + + /** + * 鍒涘缓浜� + */ + @TableField("create_user") + private Integer createUser; + + /** + * 鍒涘缓鏃堕棿 + */ + @TableField("create_time") + private LocalDateTime createTime; + + /** + * 鏂囦功妯℃澘鍊� + */ + @TableField("value") + private String value; + + +} diff --git a/ycl-generator/src/main/java/com/ycl/entity/writ/WritTemplate.java b/ycl-generator/src/main/java/com/ycl/entity/writ/WritTemplate.java new file mode 100644 index 0000000..3b5ccb6 --- /dev/null +++ b/ycl-generator/src/main/java/com/ycl/entity/writ/WritTemplate.java @@ -0,0 +1,46 @@ +package com.ycl.entity.writ; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.Version; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableField; +import java.io.Serializable; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * <p> + * 鏂囦功妯℃澘琛� + * </p> + * + * @author lyq + * @since 2022-11-14 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@TableName("ums_writ_template") +public class WritTemplate implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * id + */ + @TableId(value = "id", type = IdType.AUTO) + private Integer id; + + /** + * 妯℃澘鍚嶇О + */ + @TableField("name") + private String name; + + /** + * 鍓嶇瀵瑰簲缁勪欢鍚嶇О + */ + @TableField("code") + private String code; + + +} diff --git a/ycl-generator/src/main/java/com/ycl/mapper/writ/WritMapper.java b/ycl-generator/src/main/java/com/ycl/mapper/writ/WritMapper.java new file mode 100644 index 0000000..da677d6 --- /dev/null +++ b/ycl-generator/src/main/java/com/ycl/mapper/writ/WritMapper.java @@ -0,0 +1,16 @@ +package com.ycl.mapper.writ; + +import com.ycl.entity.writ.Writ; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * <p> + * 鏂囦功绉嶇被 鍙拡瀵硅繚寤� Mapper 鎺ュ彛 + * </p> + * + * @author lyq + * @since 2022-11-15 + */ +public interface WritMapper extends BaseMapper<Writ> { + +} diff --git a/ycl-generator/src/main/java/com/ycl/mapper/writ/WritTemplateMapper.java b/ycl-generator/src/main/java/com/ycl/mapper/writ/WritTemplateMapper.java new file mode 100644 index 0000000..e7c0f0f --- /dev/null +++ b/ycl-generator/src/main/java/com/ycl/mapper/writ/WritTemplateMapper.java @@ -0,0 +1,16 @@ +package com.ycl.mapper.writ; + +import com.ycl.entity.writ.WritTemplate; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * <p> + * 鏂囦功妯℃澘琛� Mapper 鎺ュ彛 + * </p> + * + * @author lyq + * @since 2022-11-14 + */ +public interface WritTemplateMapper extends BaseMapper<WritTemplate> { + +} diff --git a/ycl-generator/src/main/java/com/ycl/service/writ/IWritTemplateService.java b/ycl-generator/src/main/java/com/ycl/service/writ/IWritTemplateService.java new file mode 100644 index 0000000..a6fe1cf --- /dev/null +++ b/ycl-generator/src/main/java/com/ycl/service/writ/IWritTemplateService.java @@ -0,0 +1,16 @@ +package com.ycl.service.writ; + +import com.ycl.entity.writ.WritTemplate; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + * <p> + * 鏂囦功妯℃澘琛� 鏈嶅姟绫� + * </p> + * + * @author lyq + * @since 2022-11-14 + */ +public interface IWritTemplateService extends IService<WritTemplate> { + +} diff --git a/ycl-generator/src/main/java/com/ycl/service/writ/impl/WritServiceImpl.java b/ycl-generator/src/main/java/com/ycl/service/writ/impl/WritServiceImpl.java new file mode 100644 index 0000000..a2ba3dc --- /dev/null +++ b/ycl-generator/src/main/java/com/ycl/service/writ/impl/WritServiceImpl.java @@ -0,0 +1,20 @@ +package com.ycl.service.writ.impl; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.ycl.entity.writ.Writ; +import com.ycl.mapper.writ.WritMapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.stereotype.Service; + +/** + * <p> + * 鏂囦功绉嶇被 鍙拡瀵硅繚寤� 鏈嶅姟瀹炵幇绫� + * </p> + * + * @author lyq + * @since 2022-11-15 + */ +@Service +public class WritServiceImpl extends ServiceImpl<WritMapper, Writ> implements IService<Writ> { + +} diff --git a/ycl-generator/src/main/java/com/ycl/service/writ/impl/WritTemplateServiceImpl.java b/ycl-generator/src/main/java/com/ycl/service/writ/impl/WritTemplateServiceImpl.java new file mode 100644 index 0000000..a52db0c --- /dev/null +++ b/ycl-generator/src/main/java/com/ycl/service/writ/impl/WritTemplateServiceImpl.java @@ -0,0 +1,20 @@ +package com.ycl.service.writ.impl; + +import com.ycl.entity.writ.WritTemplate; +import com.ycl.mapper.writ.WritTemplateMapper; +import com.ycl.service.writ.IWritTemplateService; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.stereotype.Service; + +/** + * <p> + * 鏂囦功妯℃澘琛� 鏈嶅姟瀹炵幇绫� + * </p> + * + * @author lyq + * @since 2022-11-14 + */ +@Service +public class WritTemplateServiceImpl extends ServiceImpl<WritTemplateMapper, WritTemplate> implements IWritTemplateService { + +} diff --git a/ycl-generator/src/main/resources/mapper/writ/WritMapper.xml b/ycl-generator/src/main/resources/mapper/writ/WritMapper.xml new file mode 100644 index 0000000..3289e0a --- /dev/null +++ b/ycl-generator/src/main/resources/mapper/writ/WritMapper.xml @@ -0,0 +1,32 @@ +<?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.writ.WritMapper"> + + <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 --> + <resultMap id="BaseResultMap" type="com.ycl.entity.writ.Writ"> + <id column="base_case_id" property="baseCaseId" /> + <result column="illegal_building_id" property="illegalBuildingId" /> + <result column="writ_type" property="writType" /> + <result column="writ_code" property="writCode" /> + <result column="illegal_type" property="illegalType" /> + <result column="send_time" property="sendTime" /> + <result column="limit_time" property="limitTime" /> + <result column="send_content" property="sendContent" /> + <result column="rectify_time" property="rectifyTime" /> + <result column="rectify_situation" property="rectifySituation" /> + <result column="remark" property="remark" /> + <result column="writ_pic" property="writPic" /> + <result column="original_pic" property="originalPic" /> + <result column="rectified_pic" property="rectifiedPic" /> + <result column="other_pic" property="otherPic" /> + <result column="create_user" property="createUser" /> + <result column="create_time" property="createTime" /> + <result column="value" property="value" /> + </resultMap> + + <!-- 閫氱敤鏌ヨ缁撴灉鍒� --> + <sql id="Base_Column_List"> + base_case_id, illegal_building_id, writ_type, writ_code, illegal_type, send_time, limit_time, send_content, rectify_time, rectify_situation, remark, writ_pic, original_pic, rectified_pic, other_pic, create_user, create_time, value + </sql> + +</mapper> diff --git a/ycl-generator/src/main/resources/mapper/writ/WritTemplateMapper.xml b/ycl-generator/src/main/resources/mapper/writ/WritTemplateMapper.xml new file mode 100644 index 0000000..aa5974b --- /dev/null +++ b/ycl-generator/src/main/resources/mapper/writ/WritTemplateMapper.xml @@ -0,0 +1,17 @@ +<?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.writ.WritTemplateMapper"> + + <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 --> + <resultMap id="BaseResultMap" type="com.ycl.entity.writ.WritTemplate"> + <id column="id" property="id" /> + <result column="name" property="name" /> + <result column="code" property="code" /> + </resultMap> + + <!-- 閫氱敤鏌ヨ缁撴灉鍒� --> + <sql id="Base_Column_List"> + id, name, code + </sql> + +</mapper> diff --git a/ycl-platform/pom.xml b/ycl-platform/pom.xml index 171e455..006145b 100644 --- a/ycl-platform/pom.xml +++ b/ycl-platform/pom.xml @@ -30,6 +30,12 @@ <artifactId>spring-boot-starter-test</artifactId> <scope>test</scope> </dependency> + <dependency> + <groupId>com.ycl</groupId> + <artifactId>ycl-generator</artifactId> + <version>1.0.0</version> + <scope>compile</scope> + </dependency> </dependencies> <build> diff --git a/ycl-platform/src/main/java/com/ycl/controller/caseHandler/DisposeRecordController.java b/ycl-platform/src/main/java/com/ycl/controller/caseHandler/DisposeRecordController.java index a7afe47..1cbae33 100644 --- a/ycl-platform/src/main/java/com/ycl/controller/caseHandler/DisposeRecordController.java +++ b/ycl-platform/src/main/java/com/ycl/controller/caseHandler/DisposeRecordController.java @@ -1,6 +1,7 @@ package com.ycl.controller.caseHandler; +import com.ycl.annotation.LogSave; import com.ycl.api.CommonResult; import com.ycl.bo.AdminUserDetails; import com.ycl.controller.BaseController; @@ -39,6 +40,7 @@ **/ @ApiOperation(value = "鏌ヨ", response = MyBacklogVO.class) @GetMapping("/query") + @LogSave(operationType = "鎴戠殑寰呭姙", contain = "鏌ヨ") public CommonResult searchMyTask(@RequestParam(required = false) String num) { AdminUserDetails user = (AdminUserDetails) SecurityContextHolder.getContext().getAuthentication().getPrincipal(); return CommonResult.success(iDisposeRecordService.listMyTask(num, user.getUserId())); diff --git a/ycl-platform/src/main/java/com/ycl/controller/epuipment/EquipmentBayonetController.java b/ycl-platform/src/main/java/com/ycl/controller/epuipment/EquipmentBayonetController.java index f2499b2..609bdab 100644 --- a/ycl-platform/src/main/java/com/ycl/controller/epuipment/EquipmentBayonetController.java +++ b/ycl-platform/src/main/java/com/ycl/controller/epuipment/EquipmentBayonetController.java @@ -41,7 +41,7 @@ @GetMapping("/query") @ApiOperation("鏌ヨ") - @LogSave + @LogSave(operationType = "鍗″彛绠$悊", contain = "鏌ヨ鍗″彛") public CommonResult search(@RequestParam(required = false) Integer size, @RequestParam(required = false) Integer current, @RequestParam(required = false) String bayonetName) { diff --git a/ycl-platform/src/main/java/com/ycl/controller/message/MessageController.java b/ycl-platform/src/main/java/com/ycl/controller/message/MessageController.java index 7c4f590..66fecba 100644 --- a/ycl-platform/src/main/java/com/ycl/controller/message/MessageController.java +++ b/ycl-platform/src/main/java/com/ycl/controller/message/MessageController.java @@ -2,6 +2,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; +import com.ycl.annotation.LogSave; import com.ycl.api.CommonResult; import com.ycl.bo.AdminUserDetails; import com.ycl.dto.message.MessageParam; @@ -37,6 +38,7 @@ @ApiOperation(value = "鍙戦�佹秷鎭�") @RequestMapping(value = "/sendMessage", method = RequestMethod.POST) @ResponseBody + @LogSave(operationType = "娑堟伅绠$悊", contain = "鍙戦�佹秷鎭�") public CommonResult sendMessage(@Validated @RequestBody Message message) { AdminUserDetails user = (AdminUserDetails) SecurityContextHolder.getContext().getAuthentication().getPrincipal(); //璁剧疆鍒涘缓浜� @@ -47,6 +49,7 @@ @ApiOperation(value = "鏆傚瓨娑堟伅") @PostMapping("/saveMessage") @ResponseBody + @LogSave(operationType = "娑堟伅绠$悊", contain = "淇濆瓨娑堟伅") public CommonResult saveMessage(@Validated @RequestBody Message message) { AdminUserDetails user = (AdminUserDetails) SecurityContextHolder.getContext().getAuthentication().getPrincipal(); //璁剧疆鍒涘缓浜� @@ -58,6 +61,7 @@ @ApiOperation(value = "鑾峰彇娑堟伅鍒嗛〉鏌ヨ") @RequestMapping(value = "/list", method = RequestMethod.GET) @ResponseBody + @LogSave(operationType = "娑堟伅绠$悊", contain = "鏌ヨ娑堟伅") public CommonResult<IPage<MessageVO>> list(MessageParam messageParam) { return CommonResult.success(iMessageService.list(messageParam)); } @@ -74,6 +78,7 @@ @ApiOperation("淇敼鎸囧畾娑堟伅") @RequestMapping(value = "/update/{id}", method = RequestMethod.POST) @ResponseBody + @LogSave(operationType = "娑堟伅绠$悊", contain = "淇敼娑堟伅") public CommonResult update(@RequestBody Message message) { AdminUserDetails user = (AdminUserDetails) SecurityContextHolder.getContext().getAuthentication().getPrincipal(); //璁剧疆鍒涘缓浜� @@ -89,6 +94,7 @@ @ApiOperation("鎵归噺鍒犻櫎娑堟伅") @RequestMapping(value = "/delete", method = RequestMethod.POST) @ResponseBody + @LogSave(operationType = "娑堟伅绠$悊", contain = "鍒犻櫎娑堟伅") public CommonResult delete(@RequestParam("ids") List<Long> ids) { boolean success = iMessageService.deleteMessages(ids); if (success) { diff --git a/ycl-platform/src/main/java/com/ycl/controller/portal/UmsWebsitePortalController.java b/ycl-platform/src/main/java/com/ycl/controller/portal/UmsWebsitePortalController.java index 6df17ef..05f65ea 100644 --- a/ycl-platform/src/main/java/com/ycl/controller/portal/UmsWebsitePortalController.java +++ b/ycl-platform/src/main/java/com/ycl/controller/portal/UmsWebsitePortalController.java @@ -42,30 +42,35 @@ @ApiOperation("logo绠$悊-娣诲姞logo") @PostMapping("/logo/add") + @LogSave(operationType = "闂ㄦ埛绠$悊", contain = "娣诲姞logo") public CommonResult addLogo(@RequestBody @Validated WebsiteLogo websiteLogo) { return CommonResult.success(umsWebsiteLogoService.save(websiteLogo)); } @ApiOperation("logo绠$悊-淇敼logo") @PutMapping("/logo/update") + @LogSave(operationType = "闂ㄦ埛绠$悊", contain = "淇敼logo") public CommonResult updateLogo(@RequestBody WebsiteLogo websiteLogo) { return CommonResult.success(umsWebsiteLogoService.updateById(websiteLogo)); } @ApiOperation("logo绠$悊-鏌ヨlogo") @GetMapping("/logo/search") + @LogSave(operationType = "闂ㄦ埛绠$悊", contain = "鏌ヨlogo") public CommonResult searchLogo() { return CommonResult.success(umsWebsiteLogoService.list(new QueryWrapper<>()).get(0)); } @ApiOperation("logo绠$悊-鏌ヨlogo") @GetMapping("/logo/searchOne") + @LogSave(operationType = "闂ㄦ埛绠$悊", contain = "鏌ヨlogo") public CommonResult searchLogo(@RequestParam Integer id) { return CommonResult.success(umsWebsiteLogoService.getOne(new QueryWrapper<WebsiteLogo>().eq("id", id))); } @ApiOperation("logo绠$悊-鍒犻櫎logo") @DeleteMapping("/logo/delete") + @LogSave(operationType = "闂ㄦ埛绠$悊", contain = "鍒犻櫎logo") public CommonResult removeLogo(@RequestParam Integer id) { return CommonResult.success(umsWebsiteLogoService.removeById(id)); } @@ -121,6 +126,7 @@ @ApiOperation("鑿滃崟鏉冮檺-涓汉鑿滃崟鐘舵�佷慨鏀�") @PutMapping("/menu/modification_myself") + @LogSave(operationType = "闂ㄦ埛绠$悊", contain = "鑿滃崟鏉冮檺淇敼") public CommonResult modifyMenusMyself(@RequestParam Long relationId, Integer status) { AdminMenuRelation adminMenuRelation = new AdminMenuRelation(); adminMenuRelation.setId(relationId); diff --git a/ycl-platform/src/main/java/com/ycl/controller/resources/ImageResourcesController.java b/ycl-platform/src/main/java/com/ycl/controller/resources/ImageResourcesController.java index f5b8966..a577643 100644 --- a/ycl-platform/src/main/java/com/ycl/controller/resources/ImageResourcesController.java +++ b/ycl-platform/src/main/java/com/ycl/controller/resources/ImageResourcesController.java @@ -31,6 +31,7 @@ @GetMapping("/query") @ApiOperation("鏌ヨ") + @LogSave(operationType = "鍥剧墖璧勬簮绠$悊", contain = "鏌ヨ鍥剧墖") public CommonResult search(@RequestParam(required = false) Integer type, @RequestParam(required = false) String startTime, @RequestParam(required = false) String endTime, diff --git a/ycl-platform/src/main/java/com/ycl/controller/resources/VideoResourcesController.java b/ycl-platform/src/main/java/com/ycl/controller/resources/VideoResourcesController.java index 8ef0a6f..ebbf0df 100644 --- a/ycl-platform/src/main/java/com/ycl/controller/resources/VideoResourcesController.java +++ b/ycl-platform/src/main/java/com/ycl/controller/resources/VideoResourcesController.java @@ -31,6 +31,7 @@ @GetMapping("/query") @ApiOperation("鏌ヨ") + @LogSave(operationType = "瑙嗛璧勬簮绠$悊", contain = "淇敼鍥剧墖") public CommonResult search(@RequestParam(required = false) Integer type, @RequestParam(required = false) String startTime, @RequestParam(required = false) String endTime, diff --git a/ycl-platform/src/main/java/com/ycl/controller/store/StoreInfoController.java b/ycl-platform/src/main/java/com/ycl/controller/store/StoreInfoController.java index 5470875..f85e5ab 100644 --- a/ycl-platform/src/main/java/com/ycl/controller/store/StoreInfoController.java +++ b/ycl-platform/src/main/java/com/ycl/controller/store/StoreInfoController.java @@ -48,6 +48,7 @@ @ApiOperation("鏍规嵁闂ㄥ簵鍚嶇О鍒嗛〉鑾峰彇闂ㄥ簵鍒楄〃鍒楄〃") @RequestMapping(value = "/list", method = RequestMethod.GET) @ResponseBody + @LogSave(operationType = "闂ㄥ簵绠$悊", contain = "鏌ヨ闂ㄥ簵") public CommonResult<CommonPage<StoreInfoVO>> list(@RequestParam(value = "keyword", required = false) String keyword, @RequestParam(value = "pageSize", defaultValue = "5") Integer pageSize, @RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum) { @@ -58,6 +59,7 @@ @ApiOperation("鏍规嵁id鑾峰彇闂ㄥ簵淇℃伅") @RequestMapping(value = "/{id}", method = RequestMethod.GET) @ResponseBody + @LogSave(operationType = "闂ㄥ簵绠$悊", contain = "鏌ヨ闂ㄥ簵") public CommonResult<StoreInfoVO> getItem(@PathVariable Long id) { StoreInfo storeInfo = storeInfoService.getById(id); StoreInfoVO vo = new StoreInfoVO(); @@ -95,6 +97,7 @@ @ApiOperation(value = "鏍规嵁id鍒犻櫎闂ㄥ簵淇℃伅") @RequestMapping(value = "/delete/{id}", method = RequestMethod.GET) @ResponseBody + @LogSave(operationType = "闂ㄥ簵绠$悊", contain = "鍒犻櫎闂ㄥ簵") public CommonResult delete(@PathVariable Long id) { boolean success = storeInfoService.removeById(id); if (success) { @@ -107,6 +110,7 @@ @ApiOperation(value = "淇敼闂ㄥ簵淇℃伅") @RequestMapping(value = "/update", method = RequestMethod.PUT) @ResponseBody + @LogSave(operationType = "闂ㄥ簵绠$悊", contain = "淇敼闂ㄥ簵") public CommonResult update(@RequestBody StoreInfo storeInfo) { boolean success = storeInfoService.updateById(storeInfo); if (success) { @@ -119,6 +123,7 @@ @ApiOperation(value = "鏍规嵁excel妯℃澘鎵归噺瀵煎叆闂ㄥ簵淇℃伅") @RequestMapping(value = "/add/excel", method = RequestMethod.POST) @ResponseBody + @LogSave(operationType = "闂ㄥ簵绠$悊", contain = "瀵煎叆闂ㄥ簵") public CommonResult addByExcel(MultipartFile file) { boolean success = storeInfoService.addByExcel(file); if (success) { diff --git a/ycl-platform/src/main/java/com/ycl/controller/video/VideoPointController.java b/ycl-platform/src/main/java/com/ycl/controller/video/VideoPointController.java index b12ccc8..f0e99e0 100644 --- a/ycl-platform/src/main/java/com/ycl/controller/video/VideoPointController.java +++ b/ycl-platform/src/main/java/com/ycl/controller/video/VideoPointController.java @@ -2,6 +2,7 @@ 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.video.VideoPoint; @@ -29,6 +30,7 @@ @GetMapping("/query") @ApiOperation("鏌ヨ") + @LogSave(operationType = "鐐逛綅绠$悊", contain = "鏌ヨ鐐逛綅") public CommonResult searchVideoPoint(@RequestParam Long size, @RequestParam Long current, @RequestParam(required = false) Integer streetId, @@ -38,18 +40,21 @@ @PostMapping("/addition") @ApiOperation("娣诲姞") + @LogSave(operationType = "鐐逛綅绠$悊", contain = "娣诲姞鐐逛綅") public CommonResult addVideoPoint(@RequestBody VideoPoint videoPoint) { return CommonResult.success(iVideoPointService.save(videoPoint)); } @PutMapping("/modification") @ApiOperation("缂栬緫") + @LogSave(operationType = "鐐逛綅绠$悊", contain = "缂栬緫鐐逛綅") public CommonResult modifyVideoPoint(@RequestBody VideoPoint videoPoint) { return CommonResult.success(iVideoPointService.updateById(videoPoint)); } @DeleteMapping("/deletion") @ApiOperation("鍒犻櫎") + @LogSave(operationType = "鐐逛綅绠$悊", contain = "淇敼鐐逛綅") public CommonResult deleteVideoPoint(@RequestParam Long id) { return CommonResult.success(iVideoPointService.removeById(id)); } diff --git a/ycl-platform/src/main/java/com/ycl/controller/writ/WritController.java b/ycl-platform/src/main/java/com/ycl/controller/writ/WritController.java new file mode 100644 index 0000000..fb73f6f --- /dev/null +++ b/ycl-platform/src/main/java/com/ycl/controller/writ/WritController.java @@ -0,0 +1,65 @@ +package com.ycl.controller.writ; + + +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.base.BaseController; +import com.ycl.entity.caseHandler.Writ; +import com.ycl.service.caseHandler.IWritService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * <p> + * 鏂囦功绉嶇被 鍙拡瀵硅繚寤� 鍓嶇鎺у埗鍣� + * </p> + * + * @author lyq + * @since 2022-11-15 + */ +@RestController +@RequestMapping("/writ") +@Api(value = "鏂囦功绠$悊") +public class WritController extends BaseController { + + @Autowired + IWritService iWritService; + + @GetMapping("/query") + @ApiOperation(value = "鏌ヨlist") + @LogSave(operationType = "鏂囦功绠$悊", contain = "鏌ヨ鏂囦功") + public CommonResult search(@RequestParam Integer size, + @RequestParam Integer current, + @RequestParam(required = false) Integer writType) { + return CommonResult.success(iWritService.page(new Page<>(size, current), new LambdaQueryWrapper<Writ>() + .eq(writType != null, Writ::getWritType, writType))); + } + + @GetMapping("/query_one") + @ApiOperation(value = "鏌ヨone") + @LogSave(operationType = "鏂囦功绠$悊", contain = "鏌ョ湅鏂囦功") + public CommonResult searchOne(@RequestParam Integer id) { + return CommonResult.success(iWritService.getById(id)); + } + + @PutMapping("/modification") + @ApiOperation(value = "淇敼") + @LogSave(operationType = "鏂囦功绠$悊", contain = "淇敼鏂囦功") + public CommonResult modify(@RequestBody Writ writ) { + return CommonResult.success(iWritService.updateById(writ)); + } + + @PutMapping("/deletion_batch") + @ApiOperation(value = "鎵归噺鍒犻櫎") + @LogSave(operationType = "鏂囦功绠$悊", contain = "鍒犻櫎鏂囦功") + public CommonResult modifyBatch(@RequestParam List<Long> ids) { + return CommonResult.success(iWritService.removeBatchByIds(ids)); + } + +} diff --git a/ycl-platform/src/main/java/com/ycl/controller/writ/WritTemplateController.java b/ycl-platform/src/main/java/com/ycl/controller/writ/WritTemplateController.java new file mode 100644 index 0000000..bb03a70 --- /dev/null +++ b/ycl-platform/src/main/java/com/ycl/controller/writ/WritTemplateController.java @@ -0,0 +1,45 @@ +package com.ycl.controller.writ; + + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.StringUtils; +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.writ.WritTemplate; +import com.ycl.service.writ.IWritTemplateService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; + +/** + * <p> + * 鏂囦功妯℃澘琛� 鍓嶇鎺у埗鍣� + * </p> + * + * @author lyq + * @since 2022-11-14 + */ +@RestController +@RequestMapping("/writ_template") +@Api(tags = "鏂囦功妯℃澘绠$悊") +public class WritTemplateController extends BaseController { + + @Autowired + IWritTemplateService iWritTemplateService; + + @GetMapping("/query") + @ApiOperation(value = "鏌ヨ") + @LogSave(operationType = "鏂囦功妯℃澘绠$悊", contain = "鏌ヨ鏂囦功妯℃澘") + public CommonResult search(@RequestParam Integer size, + @RequestParam Integer current, + @RequestParam(required = false) String name) { + return CommonResult.success(iWritTemplateService.page(new Page<>(size, current), new LambdaQueryWrapper<WritTemplate>() + .like(StringUtils.isNotBlank(name), WritTemplate::getName, name))); + } +} \ No newline at end of file diff --git a/ycl-platform/src/main/java/com/ycl/dto/dispatch/UploadDisposingResultParam.java b/ycl-platform/src/main/java/com/ycl/dto/dispatch/UploadDisposingResultParam.java index dd9e24b..4f0a43f 100644 --- a/ycl-platform/src/main/java/com/ycl/dto/dispatch/UploadDisposingResultParam.java +++ b/ycl-platform/src/main/java/com/ycl/dto/dispatch/UploadDisposingResultParam.java @@ -1,5 +1,6 @@ package com.ycl.dto.dispatch; +import com.baomidou.mybatisplus.annotation.TableField; import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonProperty; import io.swagger.annotations.ApiModel; @@ -178,6 +179,12 @@ @ApiModelProperty(value = "鍏朵粬鐓х墖") private String otherPic; + /** + * 鏂囦功妯℃澘鍊� + */ + @ApiModelProperty(value = "鏂囦功妯℃澘鍊�") + private String value; + //褰撲簨浜� /** diff --git a/ycl-platform/src/main/java/com/ycl/entity/caseHandler/Writ.java b/ycl-platform/src/main/java/com/ycl/entity/caseHandler/Writ.java index 0916745..3d212c5 100644 --- a/ycl-platform/src/main/java/com/ycl/entity/caseHandler/Writ.java +++ b/ycl-platform/src/main/java/com/ycl/entity/caseHandler/Writ.java @@ -146,5 +146,11 @@ @ApiModelProperty(value = "鍒涘缓鏃堕棿") private LocalDateTime createTime; + /** + * 鏂囦功妯℃澘鍊� + */ + @TableField("value") + private String value; + } diff --git a/ycl-platform/src/main/java/com/ycl/entity/writ/WritRecord.java b/ycl-platform/src/main/java/com/ycl/entity/writ/WritRecord.java new file mode 100644 index 0000000..d8c5d98 --- /dev/null +++ b/ycl-platform/src/main/java/com/ycl/entity/writ/WritRecord.java @@ -0,0 +1,71 @@ +package com.ycl.entity.writ; + +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; + +/** + * <p> + * 鏂囦功璁板綍琛� + * </p> + * + * @author lyq + * @since 2022-11-14 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@TableName("ums_writ_record") +public class WritRecord implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * id + */ + @TableId(value = "id", type = IdType.AUTO) + private Integer id; + + /** + * 妗堜欢id + */ + @TableField("base_case_id") + private Long baseCaseId; + + /** + * 妯℃澘id + */ + @TableField("writ_template_id") + private Integer writTemplateId; + + /** + * 鍊� + */ + @TableField("value") + private String value; + + /** + * 鍒涘缓鏃堕棿 + */ + @TableField("create_time") + private LocalDateTime createTime; + + /** + * 鍒涘缓浜篿d + */ + @TableField("user_id") + private Long userId; + + /** + * 淇敼鏃堕棿 + */ + @TableField("update_time") + private LocalDateTime updateTime; + + +} diff --git a/ycl-platform/src/main/java/com/ycl/entity/writ/WritTemplate.java b/ycl-platform/src/main/java/com/ycl/entity/writ/WritTemplate.java new file mode 100644 index 0000000..c0b120d --- /dev/null +++ b/ycl-platform/src/main/java/com/ycl/entity/writ/WritTemplate.java @@ -0,0 +1,46 @@ +package com.ycl.entity.writ; + +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; + +/** + * <p> + * 鏂囦功妯℃澘琛� + * </p> + * + * @author lyq + * @since 2022-11-14 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@TableName("ums_writ_template") +public class WritTemplate implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * id + */ + @TableId(value = "id", type = IdType.AUTO) + private Integer id; + + /** + * 妯℃澘鍚嶇О + */ + @TableField("name") + private String name; + + /** + * 鍓嶇瀵瑰簲缁勪欢鍚嶇О + */ + @TableField("code") + private String code; + + +} diff --git a/ycl-platform/src/main/java/com/ycl/mapper/writ/WritTemplateMapper.java b/ycl-platform/src/main/java/com/ycl/mapper/writ/WritTemplateMapper.java new file mode 100644 index 0000000..fce2b22 --- /dev/null +++ b/ycl-platform/src/main/java/com/ycl/mapper/writ/WritTemplateMapper.java @@ -0,0 +1,16 @@ +package com.ycl.mapper.writ; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.ycl.entity.writ.WritTemplate; + +/** + * <p> + * 鏂囦功妯℃澘琛� Mapper 鎺ュ彛 + * </p> + * + * @author lyq + * @since 2022-11-14 + */ +public interface WritTemplateMapper extends BaseMapper<WritTemplate> { + +} diff --git a/ycl-platform/src/main/java/com/ycl/service/impl/WritServiceImpl.java b/ycl-platform/src/main/java/com/ycl/service/impl/WritServiceImpl.java new file mode 100644 index 0000000..175ee8a --- /dev/null +++ b/ycl-platform/src/main/java/com/ycl/service/impl/WritServiceImpl.java @@ -0,0 +1,19 @@ +package com.ycl.service.impl; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.ycl.entity.writ.Writ; +import org.springframework.stereotype.Service; + +/** + * <p> + * 鏂囦功绉嶇被 鍙拡瀵硅繚寤� 鏈嶅姟瀹炵幇绫� + * </p> + * + * @author lyq + * @since 2022-11-15 + */ +@Service +public class WritServiceImpl extends ServiceImpl<WritMapper, Writ> implements IService<Writ> { + +} diff --git a/ycl-platform/src/main/java/com/ycl/service/impl/WritTemplateServiceImpl.java b/ycl-platform/src/main/java/com/ycl/service/impl/WritTemplateServiceImpl.java new file mode 100644 index 0000000..cc4d094 --- /dev/null +++ b/ycl-platform/src/main/java/com/ycl/service/impl/WritTemplateServiceImpl.java @@ -0,0 +1,20 @@ +package com.ycl.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.ycl.entity.writ.WritTemplate; +import com.ycl.mapper.writ.WritTemplateMapper; +import com.ycl.service.writ.IWritTemplateService; +import org.springframework.stereotype.Service; + +/** + * <p> + * 鏂囦功妯℃澘琛� 鏈嶅姟瀹炵幇绫� + * </p> + * + * @author lyq + * @since 2022-11-14 + */ +@Service +public class WritTemplateServiceImpl extends ServiceImpl<WritTemplateMapper, WritTemplate> implements IWritTemplateService { + +} diff --git a/ycl-platform/src/main/java/com/ycl/service/writ/IWritTemplateService.java b/ycl-platform/src/main/java/com/ycl/service/writ/IWritTemplateService.java new file mode 100644 index 0000000..eae9f61 --- /dev/null +++ b/ycl-platform/src/main/java/com/ycl/service/writ/IWritTemplateService.java @@ -0,0 +1,16 @@ +package com.ycl.service.writ; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.ycl.entity.writ.WritTemplate; + +/** + * <p> + * 鏂囦功妯℃澘琛� 鏈嶅姟绫� + * </p> + * + * @author lyq + * @since 2022-11-14 + */ +public interface IWritTemplateService extends IService<WritTemplate> { + +} diff --git a/ycl-platform/src/main/java/com/ycl/service/writ/impl/WritTemplateServiceImpl.java b/ycl-platform/src/main/java/com/ycl/service/writ/impl/WritTemplateServiceImpl.java new file mode 100644 index 0000000..fea91aa --- /dev/null +++ b/ycl-platform/src/main/java/com/ycl/service/writ/impl/WritTemplateServiceImpl.java @@ -0,0 +1,20 @@ +package com.ycl.service.writ.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.ycl.entity.writ.WritTemplate; +import com.ycl.mapper.writ.WritTemplateMapper; +import com.ycl.service.writ.IWritTemplateService; +import org.springframework.stereotype.Service; + +/** + * <p> + * 鏂囦功妯℃澘琛� 鏈嶅姟瀹炵幇绫� + * </p> + * + * @author lyq + * @since 2022-11-14 + */ +@Service +public class WritTemplateServiceImpl extends ServiceImpl<WritTemplateMapper, WritTemplate> implements IWritTemplateService { + +} diff --git a/ycl-platform/src/main/resources/mapper/writ/WritTemplateMapper.xml b/ycl-platform/src/main/resources/mapper/writ/WritTemplateMapper.xml new file mode 100644 index 0000000..aa5974b --- /dev/null +++ b/ycl-platform/src/main/resources/mapper/writ/WritTemplateMapper.xml @@ -0,0 +1,17 @@ +<?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.writ.WritTemplateMapper"> + + <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 --> + <resultMap id="BaseResultMap" type="com.ycl.entity.writ.WritTemplate"> + <id column="id" property="id" /> + <result column="name" property="name" /> + <result column="code" property="code" /> + </resultMap> + + <!-- 閫氱敤鏌ヨ缁撴灉鍒� --> + <sql id="Base_Column_List"> + id, name, code + </sql> + +</mapper> -- Gitblit v1.8.0