From 0d02ee0aeeaa7c4df579a57b6f75e59c69a1ed26 Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期三, 16 十一月 2022 10:22:06 +0800
Subject: [PATCH] Merge branch 'master' of http://42.193.1.25:9521/r/sccg_server
---
ycl-platform/src/main/java/com/ycl/mapper/caseHandler/WritMapper.java | 3
ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/WritServiceImpl.java | 11 +
ycl-platform/src/main/java/com/ycl/controller/trend/TrendAnalysisController.java | 41 +++++
ycl-platform/src/main/java/com/ycl/vo/writ/WritVO.java | 120 +++++++++++++++
ycl-generator/src/main/java/com/ycl/MysqlGenerator.java | 2
ycl-platform/src/main/resources/mapper/trend/TrendAnalysisMapper.xml | 37 ++++
ycl-platform/src/main/java/com/ycl/vo/TrendVo.java | 29 +++
ycl-platform/src/main/resources/mapper/caseHandler/BaseCaseMapper.xml | 8
ycl-generator/pom.xml | 6
/dev/null | 20 --
ycl-platform/src/main/java/com/ycl/controller/writ/WritController.java | 7
ycl-platform/src/main/java/com/ycl/controller/writ/WritTemplateController.java | 2
ycl-platform/src/main/resources/mapper/caseHandler/WritMapper.xml | 47 +++--
ycl-platform/src/main/resources/mapper/writ/WritTemplateMapper.xml | 2
ycl-platform/src/main/java/com/ycl/service/writ/impl/WritTemplateServiceImpl.java | 1
ycl-platform/src/main/java/com/ycl/service/trend/impl/TrendAnalysisServiceImpl.java | 36 ++++
ycl-platform/src/main/java/com/ycl/dto/trend/TrendAnalysisParam.java | 25 +++
ycl-platform/src/main/java/com/ycl/mapper/trend/TrendAnalysisMapper.java | 13 +
ycl-platform/src/main/java/com/ycl/service/trend/TrendAnalysisService.java | 17 ++
ycl-platform/src/main/java/com/ycl/service/caseHandler/IWritService.java | 5
20 files changed, 383 insertions(+), 49 deletions(-)
diff --git a/ycl-generator/pom.xml b/ycl-generator/pom.xml
index 8d92dbd..2b4ef2e 100644
--- a/ycl-generator/pom.xml
+++ b/ycl-generator/pom.xml
@@ -79,6 +79,12 @@
<version>1.5.22</version>
<scope>compile</scope>
</dependency>
+ <dependency>
+ <groupId>com.ycl</groupId>
+ <artifactId>ycl-common</artifactId>
+ <version>1.0.0</version>
+ <scope>compile</scope>
+ </dependency>
</dependencies>
<build>
diff --git a/ycl-generator/src/main/java/com/ycl/MysqlGenerator.java b/ycl-generator/src/main/java/com/ycl/MysqlGenerator.java
index 3c4b34d..2c899e7 100644
--- a/ycl-generator/src/main/java/com/ycl/MysqlGenerator.java
+++ b/ycl-generator/src/main/java/com/ycl/MysqlGenerator.java
@@ -11,7 +11,7 @@
import com.baomidou.mybatisplus.generator.config.po.TableInfo;
import com.baomidou.mybatisplus.generator.config.rules.NamingStrategy;
import com.baomidou.mybatisplus.generator.engine.FreemarkerTemplateEngine;
-import com.ycl.base.BaseController;
+import com.ycl.controller.BaseController;
import java.util.ArrayList;
diff --git a/ycl-generator/src/main/java/com/ycl/base/BaseController.java b/ycl-generator/src/main/java/com/ycl/base/BaseController.java
deleted file mode 100644
index 117f23e..0000000
--- a/ycl-generator/src/main/java/com/ycl/base/BaseController.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.ycl.base;
-
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * @author Lyq
- * @version 1.0
- * @date 2022/9/14
- */
-@RestController
-public class BaseController {
-}
diff --git a/ycl-generator/src/main/java/com/ycl/controller/cockpitManage/TeamConstructionController.java b/ycl-generator/src/main/java/com/ycl/controller/cockpitManage/TeamConstructionController.java
deleted file mode 100644
index 402a4b5..0000000
--- a/ycl-generator/src/main/java/com/ycl/controller/cockpitManage/TeamConstructionController.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package com.ycl.controller.cockpitManage;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
-import com.ycl.base.BaseController;
-
-/**
- * <p>
- * 闃熶紞寤鸿琛� 鍓嶇鎺у埗鍣�
- * </p>
- *
- * @author zhanghua
- * @since 2022-10-31
- */
-@RestController
-@RequestMapping("/team-construction")
-public class TeamConstructionController extends BaseController {
-
-}
diff --git a/ycl-generator/src/main/java/com/ycl/controller/message/MessageColumnSetController.java b/ycl-generator/src/main/java/com/ycl/controller/message/MessageColumnSetController.java
deleted file mode 100644
index 8133eaf..0000000
--- a/ycl-generator/src/main/java/com/ycl/controller/message/MessageColumnSetController.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package com.ycl.controller.message;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
-import com.ycl.base.BaseController;
-
-/**
- * <p>
- * 娑堟伅鏍忕洰璁剧疆琛� 鍓嶇鎺у埗鍣�
- * </p>
- *
- * @author lyq
- * @since 2022-11-08
- */
-@RestController
-@RequestMapping("/message-column-set")
-public class MessageColumnSetController extends BaseController {
-
-}
diff --git a/ycl-generator/src/main/java/com/ycl/controller/message/MessageController.java b/ycl-generator/src/main/java/com/ycl/controller/message/MessageController.java
deleted file mode 100644
index ea0e5c0..0000000
--- a/ycl-generator/src/main/java/com/ycl/controller/message/MessageController.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package com.ycl.controller.message;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
-import com.ycl.base.BaseController;
-
-/**
- * <p>
- * 娑堟伅琛� 鍓嶇鎺у埗鍣�
- * </p>
- *
- * @author lyq
- * @since 2022-11-11
- */
-@RestController
-@RequestMapping("/message")
-public class MessageController extends BaseController {
-
-}
diff --git a/ycl-generator/src/main/java/com/ycl/controller/writ/WritController.java b/ycl-generator/src/main/java/com/ycl/controller/writ/WritController.java
deleted file mode 100644
index 829c8ff..0000000
--- a/ycl-generator/src/main/java/com/ycl/controller/writ/WritController.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package com.ycl.controller.writ;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
-import com.ycl.base.BaseController;
-
-/**
- * <p>
- * 鏂囦功绉嶇被 鍙拡瀵硅繚寤� 鍓嶇鎺у埗鍣�
- * </p>
- *
- * @author lyq
- * @since 2022-11-15
- */
-@RestController
-@RequestMapping("/writ")
-public class WritController extends BaseController {
-
-}
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
deleted file mode 100644
index 572c025..0000000
--- a/ycl-generator/src/main/java/com/ycl/controller/writ/WritTemplateController.java
+++ /dev/null
@@ -1,25 +0,0 @@
-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/message/Message.java b/ycl-generator/src/main/java/com/ycl/entity/message/Message.java
deleted file mode 100644
index 1e60ebf..0000000
--- a/ycl-generator/src/main/java/com/ycl/entity/message/Message.java
+++ /dev/null
@@ -1,162 +0,0 @@
-package com.ycl.entity.message;
-
-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 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-11
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@TableName("ums_message")
-public class Message implements Serializable {
-
- private static final long serialVersionUID = 1L;
-
- /**
- * 涓婚敭Id
- */
- @TableId(value = "id", type = IdType.AUTO)
- private Integer id;
-
- /**
- * 鍘熷娑堟伅涓�0
- */
- @TableField("parent_id")
- private Integer parentId;
-
- /**
- * 鏍囬
- */
- @TableField("head")
- private String head;
-
- /**
- * 娓犻亾鐮�01-鍐呯珯淇�03-閭欢02-鐭俊
- */
- @TableField("channel_code")
- private String channelCode;
-
- /**
- * 娑堟伅绫诲瀷
- */
- @TableField("message_type")
- private Integer messageType;
-
- /**
- * 娑堟伅浣�
- */
- @TableField("body")
- private String body;
-
- /**
- * 鍙戦�佽��
- */
- @TableField("target_from")
- private String targetFrom;
-
- /**
- * 鎺ユ敹鑰�
- */
- @TableField("target_to")
- private String targetTo;
-
- /**
- * 娑堟伅缂栧彿
- */
- @TableField("message_number")
- private String messageNumber;
-
- /**
- * 闅忔満鐮�
- */
- @TableField("random_code")
- private String randomCode;
-
- /**
- * 杩囨湡鏃堕棿
- */
- @TableField("over_time")
- private LocalDateTime overTime;
-
- /**
- * 鍙戦�佹椂闂�
- */
- @TableField("send_time")
- private LocalDateTime sendTime;
-
- /**
- * 鏄惁鎵弿0-鏈壂鎻�1-宸叉壂鎻�
- */
- @TableField("is_scan")
- private Integer isScan;
-
- /**
- * 鐘舵��0-鏈彂甯�1-宸插彂甯�2-鎴愬姛3-澶辫触
- */
- @TableField("status")
- private Integer status;
-
- /**
- * 鏄惁鏌ョ湅0-鏈煡鐪�1-宸叉煡鐪�
- */
- @TableField("is_view")
- private Integer isView;
-
- /**
- * 澶囨敞
- */
- @TableField("remark")
- private String remark;
-
- /**
- * 鏁版嵁鐗堟湰
- */
- @TableField("version")
- @Version
- private Integer version;
-
- /**
- * 鍒涘缓浜�
- */
- @TableField("create_user")
- private Integer createUser;
-
- /**
- * 鍒涘缓鏃堕棿
- */
- @TableField("create_time")
- private LocalDateTime createTime;
-
- /**
- * 鏇存柊浜�
- */
- @TableField("update_user")
- private Integer updateUser;
-
- /**
- * 鏇存柊鏃堕棿
- */
- @TableField("update_time")
- private LocalDateTime updateTime;
-
- /**
- * 鍝嶅簲缁撴灉
- */
- @TableField("respond_result")
- private String respondResult;
-
-
-}
diff --git a/ycl-generator/src/main/java/com/ycl/entity/message/MessageColumnSet.java b/ycl-generator/src/main/java/com/ycl/entity/message/MessageColumnSet.java
deleted file mode 100644
index 273ea5c..0000000
--- a/ycl-generator/src/main/java/com/ycl/entity/message/MessageColumnSet.java
+++ /dev/null
@@ -1,52 +0,0 @@
-package com.ycl.entity.message;
-
-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-08
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@TableName("ums_message_column_set")
-public class MessageColumnSet implements Serializable {
-
- private static final long serialVersionUID = 1L;
-
- /**
- * 涓婚敭Id
- */
- @TableId(value = "id", type = IdType.AUTO)
- private Integer id;
-
- /**
- * 鐢ㄦ埛Id
- */
- @TableField("user_id")
- private Integer userId;
-
- /**
- * 鏍忕洰Id
- */
- @TableField("message_column_id")
- private Integer messageColumnId;
-
- /**
- * 鏄惁鎺ユ敹0-涓嶆帴鏀�1-鎺ユ敹
- */
- @TableField("is_receive")
- private Integer isReceive;
-
-
-}
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
deleted file mode 100644
index c04ba5c..0000000
--- a/ycl-generator/src/main/java/com/ycl/entity/writ/Writ.java
+++ /dev/null
@@ -1,136 +0,0 @@
-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
deleted file mode 100644
index 3b5ccb6..0000000
--- a/ycl-generator/src/main/java/com/ycl/entity/writ/WritTemplate.java
+++ /dev/null
@@ -1,46 +0,0 @@
-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/message/MessageColumnSetMapper.java b/ycl-generator/src/main/java/com/ycl/mapper/message/MessageColumnSetMapper.java
deleted file mode 100644
index aede402..0000000
--- a/ycl-generator/src/main/java/com/ycl/mapper/message/MessageColumnSetMapper.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.ycl.mapper.message;
-
-import com.ycl.entity.message.MessageColumnSet;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- * 娑堟伅鏍忕洰璁剧疆琛� Mapper 鎺ュ彛
- * </p>
- *
- * @author lyq
- * @since 2022-11-08
- */
-public interface MessageColumnSetMapper extends BaseMapper<MessageColumnSet> {
-
-}
diff --git a/ycl-generator/src/main/java/com/ycl/mapper/message/MessageMapper.java b/ycl-generator/src/main/java/com/ycl/mapper/message/MessageMapper.java
deleted file mode 100644
index 7c27af9..0000000
--- a/ycl-generator/src/main/java/com/ycl/mapper/message/MessageMapper.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.ycl.mapper.message;
-
-import com.ycl.entity.message.Message;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- * 娑堟伅琛� Mapper 鎺ュ彛
- * </p>
- *
- * @author lyq
- * @since 2022-11-11
- */
-public interface MessageMapper extends BaseMapper<Message> {
-
-}
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
deleted file mode 100644
index da677d6..0000000
--- a/ycl-generator/src/main/java/com/ycl/mapper/writ/WritMapper.java
+++ /dev/null
@@ -1,16 +0,0 @@
-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
deleted file mode 100644
index e7c0f0f..0000000
--- a/ycl-generator/src/main/java/com/ycl/mapper/writ/WritTemplateMapper.java
+++ /dev/null
@@ -1,16 +0,0 @@
-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/message/IMessageColumnSetService.java b/ycl-generator/src/main/java/com/ycl/service/message/IMessageColumnSetService.java
deleted file mode 100644
index 4c31228..0000000
--- a/ycl-generator/src/main/java/com/ycl/service/message/IMessageColumnSetService.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.ycl.service.message;
-
-import com.ycl.entity.message.MessageColumnSet;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- * <p>
- * 娑堟伅鏍忕洰璁剧疆琛� 鏈嶅姟绫�
- * </p>
- *
- * @author lyq
- * @since 2022-11-08
- */
-public interface IMessageColumnSetService extends IService<MessageColumnSet> {
-
-}
diff --git a/ycl-generator/src/main/java/com/ycl/service/message/IMessageService.java b/ycl-generator/src/main/java/com/ycl/service/message/IMessageService.java
deleted file mode 100644
index 775e4bb..0000000
--- a/ycl-generator/src/main/java/com/ycl/service/message/IMessageService.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.ycl.service.message;
-
-import com.ycl.entity.message.Message;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- * <p>
- * 娑堟伅琛� 鏈嶅姟绫�
- * </p>
- *
- * @author lyq
- * @since 2022-11-11
- */
-public interface IMessageService extends IService<Message> {
-
-}
diff --git a/ycl-generator/src/main/java/com/ycl/service/message/impl/MessageColumnSetServiceImpl.java b/ycl-generator/src/main/java/com/ycl/service/message/impl/MessageColumnSetServiceImpl.java
deleted file mode 100644
index 3b76f3a..0000000
--- a/ycl-generator/src/main/java/com/ycl/service/message/impl/MessageColumnSetServiceImpl.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.ycl.service.message.impl;
-
-import com.ycl.entity.message.MessageColumnSet;
-import com.ycl.mapper.message.MessageColumnSetMapper;
-import com.ycl.service.message.IMessageColumnSetService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- * 娑堟伅鏍忕洰璁剧疆琛� 鏈嶅姟瀹炵幇绫�
- * </p>
- *
- * @author lyq
- * @since 2022-11-08
- */
-@Service
-public class MessageColumnSetServiceImpl extends ServiceImpl<MessageColumnSetMapper, MessageColumnSet> implements IMessageColumnSetService {
-
-}
diff --git a/ycl-generator/src/main/java/com/ycl/service/message/impl/MessageServiceImpl.java b/ycl-generator/src/main/java/com/ycl/service/message/impl/MessageServiceImpl.java
deleted file mode 100644
index 7867b4b..0000000
--- a/ycl-generator/src/main/java/com/ycl/service/message/impl/MessageServiceImpl.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.ycl.service.message.impl;
-
-import com.ycl.entity.message.Message;
-import com.ycl.mapper.message.MessageMapper;
-import com.ycl.service.message.IMessageService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- * 娑堟伅琛� 鏈嶅姟瀹炵幇绫�
- * </p>
- *
- * @author lyq
- * @since 2022-11-11
- */
-@Service
-public class MessageServiceImpl extends ServiceImpl<MessageMapper, Message> implements IMessageService {
-
-}
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
deleted file mode 100644
index a6fe1cf..0000000
--- a/ycl-generator/src/main/java/com/ycl/service/writ/IWritTemplateService.java
+++ /dev/null
@@ -1,16 +0,0 @@
-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
deleted file mode 100644
index a2ba3dc..0000000
--- a/ycl-generator/src/main/java/com/ycl/service/writ/impl/WritServiceImpl.java
+++ /dev/null
@@ -1,20 +0,0 @@
-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
deleted file mode 100644
index a52db0c..0000000
--- a/ycl-generator/src/main/java/com/ycl/service/writ/impl/WritTemplateServiceImpl.java
+++ /dev/null
@@ -1,20 +0,0 @@
-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/cockpitManage/TeamConstructionMapper.xml b/ycl-generator/src/main/resources/mapper/cockpitManage/TeamConstructionMapper.xml
deleted file mode 100644
index 3a08903..0000000
--- a/ycl-generator/src/main/resources/mapper/cockpitManage/TeamConstructionMapper.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?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.cockpitManage.TeamConstructionMapper">
-
- <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
- <resultMap id="BaseResultMap" type="com.ycl.entity.cockpitManage.TeamConstruction">
- <id column="id" property="id" />
- <result column="name" property="name" />
- <result column="people_number" property="peopleNumber" />
- <result column="up_undergraduate_people_number" property="upUndergraduatePeopleNumber" />
- <result column="under_forty_five_people_number" property="underFortyFivePeopleNumber" />
- <result column="legal_professional_qualification_certificate_people_number" property="legalProfessionalQualificationCertificatePeopleNumber" />
- <result column="report_number" property="reportNumber" />
- <result column="disciplinary_offence_number" property="disciplinaryOffenceNumber" />
- <result column="criminal_offense_number" property="criminalOffenseNumber" />
- <result column="month_case_number" property="monthCaseNumber" />
- <result column="no_timeout_case_number" property="noTimeoutCaseNumber" />
- <result column="review_or_lawsuit_number" property="reviewOrLawsuitNumber" />
- <result column="status" property="status" />
- <result column="is_delete" property="isDelete" />
- <result column="create_time" property="createTime" />
- <result column="update_time" property="updateTime" />
- </resultMap>
-
- <!-- 閫氱敤鏌ヨ缁撴灉鍒� -->
- <sql id="Base_Column_List">
- id, name, people_number, up_undergraduate_people_number, under_forty_five_people_number, legal_professional_qualification_certificate_people_number, report_number, disciplinary_offence_number, criminal_offense_number, month_case_number, no_timeout_case_number, review_or_lawsuit_number, status, is_delete, create_time, update_time
- </sql>
-
-</mapper>
diff --git a/ycl-generator/src/main/resources/mapper/message/MessageColumnSetMapper.xml b/ycl-generator/src/main/resources/mapper/message/MessageColumnSetMapper.xml
deleted file mode 100644
index 089eb7d..0000000
--- a/ycl-generator/src/main/resources/mapper/message/MessageColumnSetMapper.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?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.message.MessageColumnSetMapper">
-
- <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
- <resultMap id="BaseResultMap" type="com.ycl.entity.message.MessageColumnSet">
- <id column="id" property="id"/>
- <result column="user_id" property="userId"/>
- <result column="message_column_id" property="messageColumnId"/>
- <result column="is_receive" property="isReceive"/>
- </resultMap>
-
- <!-- 閫氱敤鏌ヨ缁撴灉鍒� -->
- <sql id="Base_Column_List">
- id
- , user_id, message_column_id, is_receive
- </sql>
- <select id="selectMessagePage" parameterType="com.ycl.dto.message.MessageParam"
- resultType="com.ycl.vo.message.MessageVO">
- SELECT
- t1.id,
- t2.username as targetFrom,
- t3.column_name as messageTypeName,
- t1.`status`,
- t1.body,
- t1.send_time,
- t1.create_time,
- t1.respond_result,
- t1.head,
- t4.username as createUser
- FROM
- `ums_message` t1
- LEFT JOIN ums_admin t2 ON t1.target_from = t2.id
- left join ums_admin t4 on t1.create_user = t4.id
- LEFT JOIN ums_message_column t3 ON t3.id = t1.message_type
- <where>
- <if test="messageParam.head !=null and messageParam.head !=''">
- t1.head like concat('%',#{messageParam.head},'%')
- </if>
- <if test="messageParam.channelCode !='' and messageParam.channelCode != null">
- and t1.channel_code=#{messageParam.channelCode}
- </if>
- <if test="messageParam.messageType != null">
- and t1.message_type=#{messageParam.messageType}
- </if>
- <if test="messageParam.startTime != null and messageParam.startTime != '' and messageParam.endTime != null and messageParam.endTime != '' ">
- and t1.create_time between #{messageParam.startTime} and #{messageParam.endTime}
- </if>
-
- <if test="messageParam.status != null">
- and t1.status=#{messageParam.status}
- </if>
- <if test="messageParam.respondResult !=null and messageParam.respondResult !='' ">
- and t1.respond_result={messageParam.respondResult}
- </if>
- <if test="messageParam.sort==1">
- ORDER BY t1.create_time desc
- </if>
- <if test="messageParam.sort==0">
- ORDER BY t1.create_time asc
- </if>
- </where>
- </select>
-</mapper>
diff --git a/ycl-generator/src/main/resources/mapper/message/MessageMapper.xml b/ycl-generator/src/main/resources/mapper/message/MessageMapper.xml
deleted file mode 100644
index f7827ce..0000000
--- a/ycl-generator/src/main/resources/mapper/message/MessageMapper.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?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.message.MessageMapper">
-
- <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
- <resultMap id="BaseResultMap" type="com.ycl.entity.message.Message">
- <id column="id" property="id" />
- <result column="parent_id" property="parentId" />
- <result column="head" property="head" />
- <result column="channel_code" property="channelCode" />
- <result column="message_type" property="messageType" />
- <result column="body" property="body" />
- <result column="target_from" property="targetFrom" />
- <result column="target_to" property="targetTo" />
- <result column="message_number" property="messageNumber" />
- <result column="random_code" property="randomCode" />
- <result column="over_time" property="overTime" />
- <result column="send_time" property="sendTime" />
- <result column="is_scan" property="isScan" />
- <result column="status" property="status" />
- <result column="is_view" property="isView" />
- <result column="remark" property="remark" />
- <result column="version" property="version" />
- <result column="create_user" property="createUser" />
- <result column="create_time" property="createTime" />
- <result column="update_user" property="updateUser" />
- <result column="update_time" property="updateTime" />
- <result column="respond_result" property="respondResult" />
- </resultMap>
-
- <!-- 閫氱敤鏌ヨ缁撴灉鍒� -->
- <sql id="Base_Column_List">
- id, parent_id, head, channel_code, message_type, body, target_from, target_to, message_number, random_code, over_time, send_time, is_scan, status, is_view, remark, version, create_user, create_time, update_user, update_time, respond_result
- </sql>
-
-</mapper>
diff --git a/ycl-generator/src/main/resources/mapper/writ/WritMapper.xml b/ycl-generator/src/main/resources/mapper/writ/WritMapper.xml
deleted file mode 100644
index 3289e0a..0000000
--- a/ycl-generator/src/main/resources/mapper/writ/WritMapper.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?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
deleted file mode 100644
index aa5974b..0000000
--- a/ycl-generator/src/main/resources/mapper/writ/WritTemplateMapper.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?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/src/main/java/com/ycl/controller/trend/TrendAnalysisController.java b/ycl-platform/src/main/java/com/ycl/controller/trend/TrendAnalysisController.java
new file mode 100644
index 0000000..aae2e6d
--- /dev/null
+++ b/ycl-platform/src/main/java/com/ycl/controller/trend/TrendAnalysisController.java
@@ -0,0 +1,41 @@
+package com.ycl.controller.trend;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.ycl.api.CommonResult;
+import com.ycl.dto.trend.TrendAnalysisParam;
+import com.ycl.service.trend.TrendAnalysisService;
+import com.ycl.vo.TrendVo;
+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;
+
+@Api(tags = "瓒嬪娍鍒嗘瀽")
+@RestController
+@RequestMapping("/trendAnalysis")
+public class TrendAnalysisController {
+ @Autowired
+ TrendAnalysisService trendAnalysisService;
+
+ @ApiOperation("鏁版嵁鏌ヨ")
+ @PostMapping("/info")
+ public CommonResult<List<TrendVo>> list(@RequestBody TrendAnalysisParam trendAnalysisParam, Integer pageSize, Integer pageNum) {
+ return CommonResult.success(trendAnalysisService.list(trendAnalysisParam,pageSize,pageNum));
+ }
+
+ @ApiOperation("鐐逛綅鏁版嵁鏌ヨ")
+ @PostMapping("/pointInfo")
+ public CommonResult<List<TrendVo>> queryPointInfo(@RequestBody String id) {
+ JSONObject jsonObject = JSON.parseObject(id);
+ return CommonResult.success(trendAnalysisService.queryPointInfo(jsonObject.getString("id")));
+ }
+
+ @ApiOperation("棣栨鎶ヨ鐐逛綅鏁版嵁鏌ヨ")
+ @PostMapping("/firstInfo")
+ public CommonResult<List<TrendVo>> queryListByCount(@RequestBody TrendAnalysisParam trendAnalysisParam, Integer pageSize, Integer pageNum) {
+ return CommonResult.success(trendAnalysisService.queryListByCount(trendAnalysisParam,pageSize,pageNum));
+ }
+}
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
index fb73f6f..837cbb8 100644
--- a/ycl-platform/src/main/java/com/ycl/controller/writ/WritController.java
+++ b/ycl-platform/src/main/java/com/ycl/controller/writ/WritController.java
@@ -5,7 +5,7 @@
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.controller.BaseController;
import com.ycl.entity.caseHandler.Writ;
import com.ycl.service.caseHandler.IWritService;
import io.swagger.annotations.Api;
@@ -25,7 +25,7 @@
*/
@RestController
@RequestMapping("/writ")
-@Api(value = "鏂囦功绠＄悊")
+@Api(tags = "鏂囦功绠＄悊")
public class WritController extends BaseController {
@Autowired
@@ -37,8 +37,7 @@
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)));
+ return CommonResult.success(iWritService.selectWritPage(new Page<>(current, size),writType));
}
@GetMapping("/query_one")
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
index bb03a70..f166b05 100644
--- a/ycl-platform/src/main/java/com/ycl/controller/writ/WritTemplateController.java
+++ b/ycl-platform/src/main/java/com/ycl/controller/writ/WritTemplateController.java
@@ -39,7 +39,7 @@
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>()
+ return CommonResult.success(iWritTemplateService.page(new Page<>(current, size), 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/trend/TrendAnalysisParam.java b/ycl-platform/src/main/java/com/ycl/dto/trend/TrendAnalysisParam.java
new file mode 100644
index 0000000..3e2508f
--- /dev/null
+++ b/ycl-platform/src/main/java/com/ycl/dto/trend/TrendAnalysisParam.java
@@ -0,0 +1,25 @@
+package com.ycl.dto.trend;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class TrendAnalysisParam {
+
+ @ApiModelProperty(value = "杩濊绫诲瀷")
+ private String type;
+
+ @ApiModelProperty(value = "寮�濮嬫椂闂�")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private String startTime;
+
+ @ApiModelProperty(value = "缁撴潫鏃堕棿")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private String endTime;
+
+}
diff --git a/ycl-platform/src/main/java/com/ycl/mapper/caseHandler/WritMapper.java b/ycl-platform/src/main/java/com/ycl/mapper/caseHandler/WritMapper.java
index 02a78f3..ba5a336 100644
--- a/ycl-platform/src/main/java/com/ycl/mapper/caseHandler/WritMapper.java
+++ b/ycl-platform/src/main/java/com/ycl/mapper/caseHandler/WritMapper.java
@@ -1,7 +1,9 @@
package com.ycl.mapper.caseHandler;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ycl.entity.caseHandler.Writ;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ycl.vo.writ.WritVO;
/**
* <p>
@@ -13,4 +15,5 @@
*/
public interface WritMapper extends BaseMapper<Writ> {
+ Page<WritVO> selectWritPage(Page<Writ> writPage, Integer writType);
}
diff --git a/ycl-platform/src/main/java/com/ycl/mapper/trend/TrendAnalysisMapper.java b/ycl-platform/src/main/java/com/ycl/mapper/trend/TrendAnalysisMapper.java
new file mode 100644
index 0000000..fd2d416
--- /dev/null
+++ b/ycl-platform/src/main/java/com/ycl/mapper/trend/TrendAnalysisMapper.java
@@ -0,0 +1,13 @@
+package com.ycl.mapper.trend;
+
+import com.ycl.dto.trend.TrendAnalysisParam;
+import com.ycl.vo.TrendVo;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+public interface TrendAnalysisMapper {
+ List<TrendVo> selectTrendInfo(@Param("tap") TrendAnalysisParam trendAnalysisParam);
+
+ List<TrendVo> selectTrendPointInfo(String id);
+}
diff --git a/ycl-platform/src/main/java/com/ycl/service/caseHandler/IWritService.java b/ycl-platform/src/main/java/com/ycl/service/caseHandler/IWritService.java
index 9de7e6c..bb0ca82 100644
--- a/ycl-platform/src/main/java/com/ycl/service/caseHandler/IWritService.java
+++ b/ycl-platform/src/main/java/com/ycl/service/caseHandler/IWritService.java
@@ -1,7 +1,10 @@
package com.ycl.service.caseHandler;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ycl.entity.caseHandler.Writ;
import com.baomidou.mybatisplus.extension.service.IService;
+import com.ycl.vo.writ.WritVO;
/**
* <p>
@@ -13,4 +16,6 @@
*/
public interface IWritService extends IService<Writ> {
+
+ Page<WritVO> selectWritPage(Page<Writ> writPage, Integer writType);
}
diff --git a/ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/WritServiceImpl.java b/ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/WritServiceImpl.java
index 3b7f47c..c79f168 100644
--- a/ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/WritServiceImpl.java
+++ b/ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/WritServiceImpl.java
@@ -1,10 +1,14 @@
package com.ycl.service.caseHandler.impl;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ycl.entity.caseHandler.Writ;
import com.ycl.mapper.caseHandler.WritMapper;
import com.ycl.service.caseHandler.IWritService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ycl.vo.writ.WritVO;
import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
/**
* <p>
@@ -17,4 +21,11 @@
@Service
public class WritServiceImpl extends ServiceImpl<WritMapper, Writ> implements IWritService {
+ @Resource
+ WritMapper writMapper;
+
+ @Override
+ public Page<WritVO> selectWritPage(Page<Writ> writPage, Integer writType) {
+ return writMapper.selectWritPage(writPage,writType);
+ }
}
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
deleted file mode 100644
index 175ee8a..0000000
--- a/ycl-platform/src/main/java/com/ycl/service/impl/WritServiceImpl.java
+++ /dev/null
@@ -1,19 +0,0 @@
-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
deleted file mode 100644
index cc4d094..0000000
--- a/ycl-platform/src/main/java/com/ycl/service/impl/WritTemplateServiceImpl.java
+++ /dev/null
@@ -1,20 +0,0 @@
-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/trend/TrendAnalysisService.java b/ycl-platform/src/main/java/com/ycl/service/trend/TrendAnalysisService.java
new file mode 100644
index 0000000..fe1dbab
--- /dev/null
+++ b/ycl-platform/src/main/java/com/ycl/service/trend/TrendAnalysisService.java
@@ -0,0 +1,17 @@
+package com.ycl.service.trend;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ycl.dto.trend.TrendAnalysisParam;
+import com.ycl.entity.store.StoreScoreRule;
+import com.ycl.vo.TrendVo;
+
+import java.util.List;
+
+public interface TrendAnalysisService {
+ List<TrendVo> list(TrendAnalysisParam trendAnalysisParam, Integer pageSize, Integer pageNum);
+
+ List<TrendVo> queryPointInfo(String id);
+
+ List<TrendVo> queryListByCount(TrendAnalysisParam trendAnalysisParam, Integer pageSize, Integer pageNum);
+}
diff --git a/ycl-platform/src/main/java/com/ycl/service/trend/impl/TrendAnalysisServiceImpl.java b/ycl-platform/src/main/java/com/ycl/service/trend/impl/TrendAnalysisServiceImpl.java
new file mode 100644
index 0000000..a399475
--- /dev/null
+++ b/ycl-platform/src/main/java/com/ycl/service/trend/impl/TrendAnalysisServiceImpl.java
@@ -0,0 +1,36 @@
+package com.ycl.service.trend.impl;
+
+
+import com.ycl.dto.trend.TrendAnalysisParam;
+import com.ycl.mapper.trend.TrendAnalysisMapper;
+import com.ycl.service.trend.TrendAnalysisService;
+import com.ycl.vo.TrendVo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.amqp.RabbitProperties;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.stream.Collectors;
+
+@Service
+public class TrendAnalysisServiceImpl implements TrendAnalysisService {
+
+
+ @Autowired
+ TrendAnalysisMapper trendAnalysisMapper;
+
+ @Override
+ public List<TrendVo> list(TrendAnalysisParam trendAnalysisParam, Integer pageSize, Integer pageNum) {
+ return trendAnalysisMapper.selectTrendInfo(trendAnalysisParam);
+ }
+
+ @Override
+ public List<TrendVo> queryPointInfo(String id) {
+ return trendAnalysisMapper.selectTrendPointInfo(id);
+ }
+
+ @Override
+ public List<TrendVo> queryListByCount(TrendAnalysisParam trendAnalysisParam, Integer pageSize, Integer pageNum) {
+ return trendAnalysisMapper.selectTrendInfo(trendAnalysisParam).stream().filter(item->"1".equals(item.getCount())).collect(Collectors.toList());
+ }
+}
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
index fea91aa..fc6b79b 100644
--- 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
@@ -1,5 +1,6 @@
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;
diff --git a/ycl-platform/src/main/java/com/ycl/vo/TrendVo.java b/ycl-platform/src/main/java/com/ycl/vo/TrendVo.java
new file mode 100644
index 0000000..fa9ccd9
--- /dev/null
+++ b/ycl-platform/src/main/java/com/ycl/vo/TrendVo.java
@@ -0,0 +1,29 @@
+package com.ycl.vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+@Data
+@ApiModel(value = "瓒嬪娍鍒嗘瀽")
+public class TrendVo {
+
+ @ApiModelProperty(value = "鐐逛綅id")
+ private String id;
+
+ @ApiModelProperty(value = "鐐逛綅鍚嶇О")
+ private String name;
+
+ @ApiModelProperty(value = "鎶ヨ鏁伴噺")
+ private String count;
+
+ @ApiModelProperty(value = "鎶ヨ鏃ユ湡")
+ private String dateTime;
+
+ @ApiModelProperty(value = "鎶ヨ鍦板潃")
+ private String address;
+
+}
diff --git a/ycl-platform/src/main/java/com/ycl/vo/writ/WritVO.java b/ycl-platform/src/main/java/com/ycl/vo/writ/WritVO.java
new file mode 100644
index 0000000..83a1156
--- /dev/null
+++ b/ycl-platform/src/main/java/com/ycl/vo/writ/WritVO.java
@@ -0,0 +1,120 @@
+package com.ycl.vo.writ;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+@Data
+@ApiModel(value = "WritVO")
+public class WritVO {
+ /**
+ * 妗堜欢id(鍚寀ms_base_case琛╥d)
+ */
+ @ApiModelProperty(value = "妗堜欢id")
+ private Long baseCaseId;
+
+ /**
+ * 杩濆缓id
+ */
+ @ApiModelProperty(value = "杩濆缓id")
+ private Long illegalBuildingId;
+
+ /**
+ * 鏂囦功绉嶇被
+ */
+ @ApiModelProperty(value = "鏂囦功绉嶇被")
+ private String writType;
+
+ /**
+ * 鏂囦功缂栧彿
+ */
+ @ApiModelProperty(value = "鏂囦功缂栧彿")
+ private String writTemplateName;
+
+ /**
+ * 杩濇硶绫诲瀷
+ */
+ @ApiModelProperty(value = "杩濇硶绫诲瀷")
+ private Integer illegalType;
+
+ /**
+ * 鏂囦功鍙戞斁鏃堕棿
+ */
+ @ApiModelProperty(value = "鏂囦功鍙戞斁鏃堕棿")
+ private LocalDateTime sendTime;
+
+ /**
+ * 鏂囦功闄愬畾鏃堕棿
+ */
+ @ApiModelProperty(value = "鏂囦功闄愬畾鏃堕棿")
+ private LocalDateTime limitTime;
+
+ /**
+ * 鏂囦功鍙戞斁鍐呭
+ */
+ @ApiModelProperty(value = "鏂囦功鍙戞斁鍐呭")
+ private String sendContent;
+
+ /**
+ * 瀹為檯鏁存敼鏃堕棿
+ */
+ @ApiModelProperty(value = "瀹為檯鏁存敼鏃堕棿")
+ private LocalDateTime rectifyTime;
+
+ /**
+ * 鏁存敼鎯呭喌
+ */
+ @ApiModelProperty(value = "鏁存敼鎯呭喌")
+ private String rectifySituation;
+
+ /**
+ * 澶囨敞
+ */
+ @ApiModelProperty(value = "澶囨敞")
+ private String remark;
+
+ /**
+ * 鏂囦功鐓х墖涓婁紶
+ */
+ @ApiModelProperty(value = "鏂囦功鐓х墖涓婁紶")
+ private String writPic;
+
+ /**
+ * 鏁存敼鍓嶇収鐗�
+ */
+ @ApiModelProperty(value = "鏁存敼鍓嶇収鐗�")
+ private String originalPic;
+
+ /**
+ * 鏁存敼鍚庣収鐗�
+ */
+ @ApiModelProperty(value = "鏁存敼鍚庣収鐗�")
+ private String rectifiedPic;
+
+ /**
+ * 鍏朵粬鐓х墖
+ */
+ @ApiModelProperty(value = "鍏朵粬鐓х墖")
+ private String otherPic;
+
+ /**
+ * 鍒涘缓浜�
+ */
+ @ApiModelProperty(value = "鍒涘缓浜�")
+ private Long createUser;
+
+ /**
+ * 鍒涘缓鏃堕棿
+ */
+ @ApiModelProperty(value = "鍒涘缓鏃堕棿")
+ private LocalDateTime createTime;
+
+ /**
+ * 鏂囦功妯℃澘鍊�
+ */
+ @ApiModelProperty(value = "鏂囦功妯℃澘鍊�")
+ private String value;
+
+}
diff --git a/ycl-platform/src/main/resources/mapper/caseHandler/BaseCaseMapper.xml b/ycl-platform/src/main/resources/mapper/caseHandler/BaseCaseMapper.xml
index b3c8dd6..6928066 100644
--- a/ycl-platform/src/main/resources/mapper/caseHandler/BaseCaseMapper.xml
+++ b/ycl-platform/src/main/resources/mapper/caseHandler/BaseCaseMapper.xml
@@ -131,10 +131,10 @@
left join ums_data_dictionary t2 on t1.category = t2.id
left join ums_sccg_region t3 on t1.community_id=t3.id
<where>
- <if test="category != null">
+ <if test="categories != null">
category = #{categories}
- </if>>
- <if test="community_id != null">
+ </if>
+ <if test="communityId != null">
and community_id = #{communityId}
</if>
<if test="code != null and code !=''">
@@ -143,7 +143,7 @@
<if test="site != null and site!=''">
and site like contact('%',#{site},'%')
</if>
- <if test="startTime !='' and endTime !=''">
+ <if test="startTime !='' and endTime !='' and startTime!=null and endTime !=null">
and create_time between #{startTime} and #{endTime}
</if>
</where>
diff --git a/ycl-platform/src/main/resources/mapper/caseHandler/WritMapper.xml b/ycl-platform/src/main/resources/mapper/caseHandler/WritMapper.xml
index 05d4d7d..0def7c2 100644
--- a/ycl-platform/src/main/resources/mapper/caseHandler/WritMapper.xml
+++ b/ycl-platform/src/main/resources/mapper/caseHandler/WritMapper.xml
@@ -4,28 +4,39 @@
<!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
<resultMap id="BaseResultMap" type="com.ycl.entity.caseHandler.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" />
+ <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"/>
</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, othen_pic, create_user, create_time
+ 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, othen_pic, create_user, create_time
</sql>
+ <select id="selectWritPage" resultType="com.ycl.vo.writ.WritVO">
+ SELECT t1.*, t2.`name` as writTemplateName
+ FROM ums_writ t1
+ LEFT JOIN ums_writ_template t2 on t1.writ_type = t2.id
+ <where>
+ <if test="writType != null">
+ t1.writ_type=#{writType}
+ </if>
+ </where>
+ </select>
</mapper>
diff --git a/ycl-platform/src/main/resources/mapper/trend/TrendAnalysisMapper.xml b/ycl-platform/src/main/resources/mapper/trend/TrendAnalysisMapper.xml
new file mode 100644
index 0000000..930caa3
--- /dev/null
+++ b/ycl-platform/src/main/resources/mapper/trend/TrendAnalysisMapper.xml
@@ -0,0 +1,37 @@
+<?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.trend.TrendAnalysisMapper">
+
+ <select id="selectTrendInfo" resultType="com.ycl.vo.TrendVo" parameterType="com.ycl.dto.trend.TrendAnalysisParam">
+ select vp.id,vp.name,count(0) as count from
+ ums_warn_alarm_record war
+ left join
+ ums_violations v
+ on v.id=war.case_number_id
+ left join
+ ums_video_point vp
+ on v.video_point_id=vp.id
+ <where>
+ <if test="tap.startTime!=null and tap.startTime!=''and tap.endTime!=null and tap.endTime!=''" >
+ war.alarm_time between #{tap.startTime} and #{tap.endTime}
+ </if>
+ <if test="tap.type!=null and tap.type!=''" >
+ war.violation_type=#{tap.type}
+ </if>
+ </where>
+ group by vp.id,vp.name
+ order by count DESC
+ </select>
+
+ <select id="selectTrendPointInfo" resultType="com.ycl.vo.TrendVo" parameterType="string">
+ SELECT vp.address, DATE_FORMAT(war.alarm_time,"%Y-%m-%d") as dateTime,count(0) as count
+ from ums_warn_alarm_record war
+ left join ums_violations v
+ on v.id=war.case_number_id
+ left join ums_video_point vp
+ on v.video_point_id=vp.id
+ where vp.id=#{id}
+ GROUP BY vp.address,DATE_FORMAT(war.alarm_time,"%Y-%m-%d")
+ </select>
+
+</mapper>
diff --git a/ycl-platform/src/main/resources/mapper/writ/WritTemplateMapper.xml b/ycl-platform/src/main/resources/mapper/writ/WritTemplateMapper.xml
index aa5974b..158a386 100644
--- a/ycl-platform/src/main/resources/mapper/writ/WritTemplateMapper.xml
+++ b/ycl-platform/src/main/resources/mapper/writ/WritTemplateMapper.xml
@@ -1,6 +1,6 @@
<?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">
+<mapper namespace="com.ycl.mapper.WritTemplateMapper">
<!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
<resultMap id="BaseResultMap" type="com.ycl.entity.writ.WritTemplate">
--
Gitblit v1.8.0