From 44a2ecbb4fd164be63390611849d69ed808247ec Mon Sep 17 00:00:00 2001
From: mg <maokecheng@163.com>
Date: 星期六, 08 十月 2022 17:41:12 +0800
Subject: [PATCH] 修改主键Id类型统一为long型
---
ycl-platform/src/main/java/com/ycl/entity/caseHandler/WorkflowConfigStep.java | 4
ycl-platform/src/main/java/com/ycl/service/message/IMessageService.java | 18 ++
ycl-platform/src/main/java/com/ycl/entity/caseHandler/BaseCase.java | 4
ycl-platform/src/main/java/com/ycl/entity/message/Message.java | 155 +++++++++++++++++++
ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/ViolationsServiceImpl.java | 6
ycl-platform/src/main/java/com/ycl/service/message/impl/IMessageServiceImpl.java | 33 ++++
ycl-platform/src/main/java/com/ycl/dto/message/MessageParam.java | 77 +++++++++
ycl-platform/src/main/java/com/ycl/entity/caseHandler/Writ.java | 6
ycl-platform/src/main/java/com/ycl/entity/caseHandler/ArrivalSituation.java | 6
ycl-platform/src/main/java/com/ycl/entity/caseHandler/Investigation.java | 9
ycl-platform/src/main/java/com/ycl/entity/caseHandler/DisposeRecord.java | 8
ycl-platform/src/main/java/com/ycl/service/caseHandler/IBaseCaseService.java | 6
ycl-platform/src/main/java/com/ycl/dto/caseHandler/DispatchInfoParam.java | 6
ycl-platform/src/main/java/com/ycl/controller/caseHandler/BaseCaseController.java | 2
ycl-platform/src/main/java/com/ycl/mapper/message/MessageMapper.java | 15 +
ycl-platform/src/main/java/com/ycl/entity/caseHandler/IllegalBuilding.java | 10
ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/CheckHandleServiceImpl.java | 2
ycl-platform/src/main/java/com/ycl/entity/caseHandler/Violations.java | 11
ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/BaseCaseServiceImpl.java | 8
ycl-platform/src/main/java/com/ycl/controller/caseHandler/DispatchHandleController.java | 10
ycl-platform/src/main/java/com/ycl/controller/message/MessageController.java | 28 +++
ycl-platform/src/main/java/com/ycl/dto/caseHandler/ChechParam.java | 4
ycl-platform/src/main/java/com/ycl/entity/caseHandler/DispatchInfo.java | 2
23 files changed, 377 insertions(+), 53 deletions(-)
diff --git a/ycl-platform/src/main/java/com/ycl/controller/caseHandler/BaseCaseController.java b/ycl-platform/src/main/java/com/ycl/controller/caseHandler/BaseCaseController.java
index 8ac83fb..13fba33 100644
--- a/ycl-platform/src/main/java/com/ycl/controller/caseHandler/BaseCaseController.java
+++ b/ycl-platform/src/main/java/com/ycl/controller/caseHandler/BaseCaseController.java
@@ -251,7 +251,7 @@
@ApiOperation(value = "缁撴")
@PutMapping("/end_case")
- public CommonResult endCase(@RequestParam Integer caseId, @RequestParam String result) {
+ public CommonResult endCase(@RequestParam Long caseId, @RequestParam String result) {
baseCaseService.endCase(caseId, result);
return CommonResult.success("end case success~!");
}
diff --git a/ycl-platform/src/main/java/com/ycl/controller/caseHandler/DispatchHandleController.java b/ycl-platform/src/main/java/com/ycl/controller/caseHandler/DispatchHandleController.java
index d1a11f1..bf8a133 100644
--- a/ycl-platform/src/main/java/com/ycl/controller/caseHandler/DispatchHandleController.java
+++ b/ycl-platform/src/main/java/com/ycl/controller/caseHandler/DispatchHandleController.java
@@ -57,7 +57,7 @@
@ApiOperation(value = "涓婁紶杩濊/杩濆缓澶勭疆缁撴灉")
@PostMapping("/addition_dispose_result")
- public CommonResult searchDisposeList(@RequestParam Integer caseId,
+ public CommonResult searchDisposeList(@RequestParam Long caseId,
@RequestParam Integer type,
@RequestBody UploadDisposingResultParam uploadDisposingResultParam) {
AdminUserDetails user = (AdminUserDetails) SecurityContextHolder.getContext().getAuthentication().getPrincipal();
@@ -79,7 +79,7 @@
BeanUtils.copyProperties(uploadDisposingResultParam, investigation);
investigation.setBaseCaseId(caseId);
investigation.setCreateTime(LocalDateTime.now());
- investigation.setCreateUser(user.getUserId().intValue());
+ investigation.setCreateUser(user.getUserId().longValue());
investigation.setPartyId(partyInfo.getId());
iInvestigationService.save(investigation);
//鍒拌揪
@@ -87,7 +87,7 @@
BeanUtils.copyProperties(uploadDisposingResultParam, arrivalSituation);
arrivalSituation.setBaseCaseId(caseId);
arrivalSituation.setCreateTime(LocalDateTime.now());
- arrivalSituation.setCreateUser(user.getUserId().intValue());
+ arrivalSituation.setCreateUser(user.getUserId().longValue());
iArrivalSituationService.save(arrivalSituation);
//鏂囦功
Integer illegalBuildingType = 2;
@@ -97,7 +97,7 @@
writ.setBaseCaseId(caseId);
writ.setIllegalBuildingId(caseId);
writ.setCreateTime(LocalDateTime.now());
- writ.setCreateUser(user.getUserId().intValue());
+ writ.setCreateUser(user.getUserId().longValue());
iWritService.save(writ);
}
baseCaseService.update(new LambdaUpdateWrapper<BaseCase>().eq(BaseCase::getId, caseId).set(BaseCase::getState, BaseCaseStatus.CHECK));
@@ -105,7 +105,7 @@
disposeRecord.setBaseCaseId(caseId);
disposeRecord.setState(0);
disposeRecord.setCreateTime(LocalDateTime.now());
- disposeRecord.setCreateUser(user.getUserId().intValue());
+ disposeRecord.setCreateUser(user.getUserId().longValue());
disposeRecord.setStepName("鏍告煡");
iDisposeRecordService.save(disposeRecord);
return CommonResult.success("add success");
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 6e299ba..356a9b2 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
@@ -1,5 +1,17 @@
package com.ycl.controller.message;
+
+import com.ycl.api.CommonResult;
+import com.ycl.bo.AdminUserDetails;
+import com.ycl.dto.message.MessageParam;
+import com.ycl.service.message.IMessageService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.core.context.SecurityContextHolder;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
/**
* <p>
* 娑堟伅绠＄悊 鍓嶇鎺у埗鍣�
@@ -8,5 +20,21 @@
* @author mg
* @since 2022-10-08
*/
+@RestController
+@RequestMapping("/message")
+@Api(tags = "娑堟伅")
public class MessageController {
+
+ @Autowired
+ IMessageService iMessageService;
+
+ @ApiOperation(value = "鍙戦�佹秷鎭�")
+ @RequestMapping(value = "/sendMessage", method = RequestMethod.POST)
+ @ResponseBody
+ public CommonResult sendMessage(@Validated @RequestBody MessageParam messageParam) {
+ AdminUserDetails user = (AdminUserDetails) SecurityContextHolder.getContext().getAuthentication().getPrincipal();
+ //璁剧疆鍒涘缓浜�
+ messageParam.setCreateUser(user.getUserId());
+ return CommonResult.success(iMessageService.sendMessage(messageParam));
+ }
}
diff --git a/ycl-platform/src/main/java/com/ycl/dto/caseHandler/ChechParam.java b/ycl-platform/src/main/java/com/ycl/dto/caseHandler/ChechParam.java
index 5964743..ceddd69 100644
--- a/ycl-platform/src/main/java/com/ycl/dto/caseHandler/ChechParam.java
+++ b/ycl-platform/src/main/java/com/ycl/dto/caseHandler/ChechParam.java
@@ -19,12 +19,12 @@
* 妗堜欢id
*/
@ApiModelProperty(value = "妗堜欢id")
- private Integer baseCaseId;
+ private Long baseCaseId;
/**
* 褰撳墠澶勭悊浜�
*/
@ApiModelProperty(value = "褰撳墠澶勭悊浜�")
- private Integer currentUser;
+ private Long currentUser;
/**
* 瀹℃牳鐘舵��
*/
diff --git a/ycl-platform/src/main/java/com/ycl/dto/caseHandler/DispatchInfoParam.java b/ycl-platform/src/main/java/com/ycl/dto/caseHandler/DispatchInfoParam.java
index 33a7709..59c9241 100644
--- a/ycl-platform/src/main/java/com/ycl/dto/caseHandler/DispatchInfoParam.java
+++ b/ycl-platform/src/main/java/com/ycl/dto/caseHandler/DispatchInfoParam.java
@@ -19,12 +19,12 @@
* 妗堜欢id
*/
@ApiModelProperty(value = "妗堜欢id")
- private Integer baseCaseId;
+ private Long baseCaseId;
/**
* 鎵ф硶浜哄憳
*/
@ApiModelProperty(value = "鎵ф硶浜哄憳")
- private Integer lawEnforcer;
+ private Long lawEnforcer;
/**
* 鎵ф硶浜哄憳濮撳悕
*/
@@ -34,7 +34,7 @@
* 鎵ф硶杞�
*/
@ApiModelProperty(value = "鎵ф硶杞�")
- private Integer enforcementCar;
+ private Long enforcementCar;
/**
* 鎵ф硶闃熶紞
*/
diff --git a/ycl-platform/src/main/java/com/ycl/dto/message/MessageParam.java b/ycl-platform/src/main/java/com/ycl/dto/message/MessageParam.java
new file mode 100644
index 0000000..bef1d13
--- /dev/null
+++ b/ycl-platform/src/main/java/com/ycl/dto/message/MessageParam.java
@@ -0,0 +1,77 @@
+package com.ycl.dto.message;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
+/**
+ * <p>
+ * 娑堟伅鍙傛暟浣�
+ * </p>
+ *
+ * @author mg
+ * @since 2022-10-08
+ */
+@Data
+@ApiModel("娑堟伅鍙傛暟浣�")
+public class MessageParam {
+ /**
+ * 鏍囬
+ */
+ @ApiModelProperty(value = "鏍囬")
+ @NotBlank(message = "鏍囬涓虹┖")
+ private String head;
+ /**
+ * 娑堟伅绫诲瀷
+ */
+ @ApiModelProperty(value = "娑堟伅绫诲瀷")
+ @NotBlank(message = "娑堟伅绫诲瀷涓虹┖")
+ private Long messageType;
+ /**
+ * 娑堟伅浣�
+ */
+ @ApiModelProperty(value = "娑堟伅浣�")
+ @NotNull(message = "娑堟伅浣撲负绌�")
+ private String body;
+ /**
+ * 鍙戦�佽��
+ */
+ @ApiModelProperty(value = "鍙戦�佽��")
+ @NotNull(message = "鍙戦�佽�呬负绌�")
+ private String targetFrom;
+ /**
+ * 鎺ユ敹鑰�
+ */
+ @ApiModelProperty(value = "鎺ユ敹鑰�")
+ @NotBlank(message = "鎺ユ敹鑰呬负绌�")
+ private String targetTo;
+ /**
+ * 闅忔満鐮�
+ */
+ @ApiModelProperty(value = "闅忔満鐮�")
+ private String randomCode;
+ /**
+ * 鍙戦�佹椂闂�
+ */
+ @ApiModelProperty(value = "鍙戦�佹椂闂�")
+ @NotBlank(message = "鍙戦�佹椂闂翠负绌�")
+ private String sendTime;
+ /**
+ * 鐘舵��0-鏈彂甯�1-宸插彂甯�
+ */
+ @ApiModelProperty(value = "鐘舵��0-鏈彂甯�1-宸插彂甯�")
+ private Integer status;
+ /**
+ * 澶囨敞
+ */
+ @ApiModelProperty(value = "澶囨敞 ps:棰勭暀瀛楁")
+ private String remark;
+ /**
+ * 鍒涘缓浜�
+ */
+ @ApiModelProperty(value = "鍒涘缓浜�")
+ private Long createUser;
+}
\ No newline at end of file
diff --git a/ycl-platform/src/main/java/com/ycl/entity/caseHandler/ArrivalSituation.java b/ycl-platform/src/main/java/com/ycl/entity/caseHandler/ArrivalSituation.java
index a764ed5..2b1901f 100644
--- a/ycl-platform/src/main/java/com/ycl/entity/caseHandler/ArrivalSituation.java
+++ b/ycl-platform/src/main/java/com/ycl/entity/caseHandler/ArrivalSituation.java
@@ -30,14 +30,14 @@
@TableId(value = "id", type = IdType.AUTO)
@ApiModelProperty(value = "id")
- private Integer id;
+ private Long id;
/**
* 妗堜欢id
*/
@TableField("base_case_id")
@ApiModelProperty(value = "妗堜欢id")
- private Integer baseCaseId;
+ private Long baseCaseId;
/**
* 鍒拌揪鏃堕棿
@@ -79,7 +79,7 @@
*/
@TableField("create_user")
@ApiModelProperty(value = "鍒涘缓浜�")
- private Integer createUser;
+ private Long createUser;
/**
* 鍒涘缓鏃堕棿
diff --git a/ycl-platform/src/main/java/com/ycl/entity/caseHandler/BaseCase.java b/ycl-platform/src/main/java/com/ycl/entity/caseHandler/BaseCase.java
index 356f2a9..4a699a7 100644
--- a/ycl-platform/src/main/java/com/ycl/entity/caseHandler/BaseCase.java
+++ b/ycl-platform/src/main/java/com/ycl/entity/caseHandler/BaseCase.java
@@ -35,7 +35,7 @@
*/
@TableId(value = "id", type = IdType.AUTO)
@ApiModelProperty(value = "id")
- private Integer id;
+ private Long id;
/**
* 浜嬩欢缂栧彿
@@ -105,7 +105,7 @@
*/
@TableField("create_user")
@ApiModelProperty(value = "鐧昏浜�")
- private Integer createUser;
+ private Long createUser;
/**
* 澶勭悊鐘舵��(0璇姤 1涓婃姤 2绔嬫 3娲鹃仯 4澶勭疆 5鏍告煡 6缁撴)
diff --git a/ycl-platform/src/main/java/com/ycl/entity/caseHandler/DispatchInfo.java b/ycl-platform/src/main/java/com/ycl/entity/caseHandler/DispatchInfo.java
index eca2dbf..11bfd9a 100644
--- a/ycl-platform/src/main/java/com/ycl/entity/caseHandler/DispatchInfo.java
+++ b/ycl-platform/src/main/java/com/ycl/entity/caseHandler/DispatchInfo.java
@@ -94,7 +94,7 @@
*/
@TableField("create_user")
@ApiModelProperty(value = "鍒涘缓浜�")
- private Integer createUser;
+ private Long createUser;
/**
* 鍒涘缓鏃堕棿
*/
diff --git a/ycl-platform/src/main/java/com/ycl/entity/caseHandler/DisposeRecord.java b/ycl-platform/src/main/java/com/ycl/entity/caseHandler/DisposeRecord.java
index 61eaf75..8b67f66 100644
--- a/ycl-platform/src/main/java/com/ycl/entity/caseHandler/DisposeRecord.java
+++ b/ycl-platform/src/main/java/com/ycl/entity/caseHandler/DisposeRecord.java
@@ -29,21 +29,21 @@
private static final long serialVersionUID = 1L;
@TableId(value = "id", type = IdType.AUTO)
- private Integer id;
+ private Long id;
/**
* 妗堜欢id
*/
@TableField("base_case_id")
@ApiModelProperty(value = "妗堜欢id")
- private Integer baseCaseId;
+ private Long baseCaseId;
/**
* 澶勭疆娴佺▼鐜妭閰嶇疆Id
*/
@TableField("workflow_config_step_id")
@ApiModelProperty(value = "澶勭疆娴佺▼鐜妭閰嶇疆Id")
- private Integer workflowConfigStepId;
+ private Long workflowConfigStepId;
/**
* 鐜妭鍚嶇О
@@ -92,7 +92,7 @@
*/
@TableField("create_user")
@ApiModelProperty(value = "鍒涘缓浜�")
- private Integer createUser;
+ private Long createUser;
/**
* 鍒涘缓鏃堕棿
diff --git a/ycl-platform/src/main/java/com/ycl/entity/caseHandler/IllegalBuilding.java b/ycl-platform/src/main/java/com/ycl/entity/caseHandler/IllegalBuilding.java
index e897b9a..ed3670f 100644
--- a/ycl-platform/src/main/java/com/ycl/entity/caseHandler/IllegalBuilding.java
+++ b/ycl-platform/src/main/java/com/ycl/entity/caseHandler/IllegalBuilding.java
@@ -1,12 +1,12 @@
package com.ycl.entity.caseHandler;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.Version;
-import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableField;
-import java.io.Serializable;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
/**
* <p>
@@ -27,7 +27,7 @@
* 妗堜欢id(鍚寀ms_base_case琛╥d)
*/
@TableId("base_case_id")
- private Integer baseCaseId;
+ private Long baseCaseId;
/**
* 杩濆缓绫诲埆
diff --git a/ycl-platform/src/main/java/com/ycl/entity/caseHandler/Investigation.java b/ycl-platform/src/main/java/com/ycl/entity/caseHandler/Investigation.java
index 65faeff..0dee79f 100644
--- a/ycl-platform/src/main/java/com/ycl/entity/caseHandler/Investigation.java
+++ b/ycl-platform/src/main/java/com/ycl/entity/caseHandler/Investigation.java
@@ -11,6 +11,7 @@
import java.io.Serializable;
import java.time.LocalDateTime;
+import java.util.Date;
/**
* <p>
@@ -30,14 +31,14 @@
@TableId(value = "id", type = IdType.AUTO)
@ApiModelProperty(value = "id")
- private Integer id;
+ private Long id;
/**
* 妗堜欢id
*/
@TableField("base_case_id")
@ApiModelProperty(value = "妗堜欢id")
- private Integer baseCaseId;
+ private Long baseCaseId;
/**
* 鎵垮姙闃熷憳
@@ -58,7 +59,7 @@
*/
@TableField("investigation_time")
@ApiModelProperty(value = "鏃堕棿")
- private LocalDateTime investigationTime;
+ private Date investigationTime;
/**
* 鍦板潃
@@ -100,7 +101,7 @@
*/
@TableField("create_user")
@ApiModelProperty(value = "鍒涘缓浜�")
- private Integer createUser;
+ private Long createUser;
/**
* 鍒涘缓鏃堕棿
diff --git a/ycl-platform/src/main/java/com/ycl/entity/caseHandler/Violations.java b/ycl-platform/src/main/java/com/ycl/entity/caseHandler/Violations.java
index c557028..62dcc5d 100644
--- a/ycl-platform/src/main/java/com/ycl/entity/caseHandler/Violations.java
+++ b/ycl-platform/src/main/java/com/ycl/entity/caseHandler/Violations.java
@@ -1,12 +1,11 @@
package com.ycl.entity.caseHandler;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.Version;
-import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableField;
-import java.io.Serializable;
-
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
import lombok.*;
+
+import java.io.Serializable;
/**
* <p>
@@ -30,7 +29,7 @@
* 妗堜欢id(鍚寀ms_base_case琛╥d)
*/
@TableId("id")
- private Integer id;
+ private Long id;
/**
* 澶х被
diff --git a/ycl-platform/src/main/java/com/ycl/entity/caseHandler/WorkflowConfigStep.java b/ycl-platform/src/main/java/com/ycl/entity/caseHandler/WorkflowConfigStep.java
index 44f254f..9714410 100644
--- a/ycl-platform/src/main/java/com/ycl/entity/caseHandler/WorkflowConfigStep.java
+++ b/ycl-platform/src/main/java/com/ycl/entity/caseHandler/WorkflowConfigStep.java
@@ -32,14 +32,14 @@
*/
@TableId(value = "id", type = IdType.AUTO)
@ApiModelProperty(value = "id")
- private Integer id;
+ private Long id;
/**
* 澶勭疆娴佺▼閰嶇疆id
*/
@TableField(value = "workflow_config_id")
@ApiModelProperty(value = "澶勭疆娴佺▼閰嶇疆id")
- private Integer workflowConfigId ;
+ private Long workflowConfigId ;
/**
* 鐜妭鍚嶇О
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 eb8645c..0916745 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
@@ -32,14 +32,14 @@
*/
@TableId("base_case_id")
@ApiModelProperty(value = "妗堜欢id")
- private Integer baseCaseId;
+ private Long baseCaseId;
/**
* 杩濆缓id
*/
@TableField("illegal_building_id")
@ApiModelProperty(value = "杩濆缓id")
- private Integer illegalBuildingId;
+ private Long illegalBuildingId;
/**
* 鏂囦功绉嶇被
@@ -137,7 +137,7 @@
*/
@TableField("create_user")
@ApiModelProperty(value = "鍒涘缓浜�")
- private Integer createUser;
+ private Long createUser;
/**
* 鍒涘缓鏃堕棿
diff --git a/ycl-platform/src/main/java/com/ycl/entity/message/Message.java b/ycl-platform/src/main/java/com/ycl/entity/message/Message.java
new file mode 100644
index 0000000..5a7b449
--- /dev/null
+++ b/ycl-platform/src/main/java/com/ycl/entity/message/Message.java
@@ -0,0 +1,155 @@
+package com.ycl.entity.message;
+
+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 io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 娑堟伅瀹炰綋绫�
+ * </p>
+ *
+ * @author mg
+ * @since 2022-10-08
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@TableName("ums_message")
+@ApiModel(value = "娑堟伅琛�")
+public class Message implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 涓婚敭
+ */
+ @TableId(value = "id", type = IdType.AUTO)
+ @ApiModelProperty(value = "涓婚敭")
+ private Long id;
+
+ /**
+ * 鏍囬
+ */
+ @TableField("head")
+ @ApiModelProperty(value = "鏍囬")
+ @NotBlank(message = "鏍囬涓虹┖")
+ private String head;
+
+ /**
+ * 娑堟伅绫诲瀷
+ */
+ @TableField("message_type")
+ @ApiModelProperty(value = "娑堟伅绫诲瀷")
+ @NotBlank(message = "娑堟伅绫诲瀷涓虹┖")
+ private Long messageType;
+
+ /**
+ * 娑堟伅浣�
+ */
+ @TableField("body")
+ @ApiModelProperty(value = "娑堟伅浣�")
+ @NotNull(message = "娑堟伅浣撲负绌�")
+ private String body;
+
+ /**
+ * 鍙戦�佽��
+ */
+ @TableField("target_from")
+ @ApiModelProperty(value = "鍙戦�佽��")
+ @NotNull(message = "鍙戦�佽�呬负绌�")
+ private String targetFrom;
+
+ /**
+ * 鎺ユ敹鑰�
+ */
+ @TableField("target_to")
+ @ApiModelProperty(value = "鎺ユ敹鑰�")
+ @NotBlank(message = "鎺ユ敹鑰呬负绌�")
+ private String targetTo;
+
+ /**
+ * 娑堟伅缂栧彿
+ */
+ @TableField("message_number")
+ @ApiModelProperty(value = "娑堟伅缂栧彿")
+ @NotBlank(message = "娑堟伅缂栧彿涓虹┖")
+ private String messageNumber;
+
+ /**
+ * 闅忔満鐮�
+ */
+ @TableField("random_code")
+ @ApiModelProperty(value = "闅忔満鐮�")
+ private String randomCode;
+ /**
+ * 杩囨湡鏃堕棿
+ */
+ @TableField("over_time")
+ @ApiModelProperty(value = "杩囨湡鏃堕棿")
+ private Date overTime;
+ /**
+ * 鍙戦�佹椂闂�
+ */
+ @TableField("send_time")
+ @ApiModelProperty(value = "鍙戦�佹椂闂�")
+ private Date sendTime;
+ /**
+ * 鐘舵��0-鏈彂甯�1-宸插彂甯�
+ */
+ @TableField("status")
+ @ApiModelProperty(value = "鐘舵��0-鏈彂甯�1-宸插彂甯�")
+ private Integer status;
+ /**
+ * 鏄惁鏌ョ湅0-鏈煡鐪�1-宸叉煡鐪�
+ */
+ @TableField("is_view")
+ @ApiModelProperty(value = "鐘舵��0-鏈彂甯�1-宸插彂甯�")
+ private Integer isView;
+ /**
+ * 澶囨敞
+ */
+ @TableField("remark")
+ @ApiModelProperty(value = "澶囨敞 ps:棰勭暀瀛楁")
+ private String remark;
+ /**
+ * 鏁版嵁鐗堟湰
+ */
+ @TableField("version")
+ @ApiModelProperty(value = "鏁版嵁鐗堟湰")
+ private Integer version;
+ /**
+ * 鍒涘缓浜�
+ */
+ @TableField("create_user")
+ @ApiModelProperty(value = "鍒涘缓浜�")
+ private Long createUser;
+ /**
+ * 鍒涘缓鏃堕棿
+ */
+ @TableField("create_time")
+ @ApiModelProperty(value = "鍒涘缓鏃堕棿")
+ private Date createTime;
+ /**
+ * 鏇存柊浜�
+ */
+ @TableField("update_user")
+ @ApiModelProperty(value = "鍒涘缓浜�")
+ private Long updateUser;
+ /**
+ * 鏇存柊鏃堕棿
+ */
+ @TableField("update_time")
+ @ApiModelProperty(value = "鏇存柊鏃堕棿")
+ private Date updateTime;
+
+}
diff --git a/ycl-platform/src/main/java/com/ycl/mapper/message/MessageMapper.java b/ycl-platform/src/main/java/com/ycl/mapper/message/MessageMapper.java
new file mode 100644
index 0000000..f781af8
--- /dev/null
+++ b/ycl-platform/src/main/java/com/ycl/mapper/message/MessageMapper.java
@@ -0,0 +1,15 @@
+package com.ycl.mapper.message;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ycl.entity.message.Message;
+
+/**
+ * <p>
+ * 娑堟伅 Mapper 鎺ュ彛
+ * </p>
+ *
+ * @author mg
+ * @since 2022-10-08
+ */
+public interface MessageMapper extends BaseMapper<Message> {
+}
diff --git a/ycl-platform/src/main/java/com/ycl/service/caseHandler/IBaseCaseService.java b/ycl-platform/src/main/java/com/ycl/service/caseHandler/IBaseCaseService.java
index fd79ad5..e16beb2 100644
--- a/ycl-platform/src/main/java/com/ycl/service/caseHandler/IBaseCaseService.java
+++ b/ycl-platform/src/main/java/com/ycl/service/caseHandler/IBaseCaseService.java
@@ -32,9 +32,9 @@
Page listIllegalBuilding(Page page, Integer state, Integer resource);
- Boolean saveViolationCase(ViolationParam violationParam,Integer id);
+ Boolean saveViolationCase(ViolationParam violationParam,Long id);
- Boolean saveIllegalBuildingCase(IllegalBuildingParam illegalBuildingParam, Integer id);
+ Boolean saveIllegalBuildingCase(IllegalBuildingParam illegalBuildingParam, Long id);
/**
* 鍚屾妗堜欢杩涘害
*
@@ -49,5 +49,5 @@
ArrayList<String> listCaseImages(Integer id, Integer type);
- void endCase(Integer caseId, String result);
+ void endCase(Long caseId, String result);
}
diff --git a/ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/BaseCaseServiceImpl.java b/ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/BaseCaseServiceImpl.java
index 0532b04..7938ed5 100644
--- a/ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/BaseCaseServiceImpl.java
+++ b/ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/BaseCaseServiceImpl.java
@@ -196,7 +196,7 @@
}
@Override
- public Boolean saveViolationCase(ViolationParam violationParam, Integer id) {
+ public Boolean saveViolationCase(ViolationParam violationParam, Long id) {
Violations violations = new Violations();
BeanUtils.copyProperties(violationParam, violations);
violations.setId(id);
@@ -205,7 +205,7 @@
}
@Override
- public Boolean saveIllegalBuildingCase(IllegalBuildingParam illegalBuildingParam, Integer id) {
+ public Boolean saveIllegalBuildingCase(IllegalBuildingParam illegalBuildingParam, Long id) {
IllegalBuilding illegalBuilding = new IllegalBuilding();
BeanUtils.copyProperties(illegalBuildingParam, illegalBuilding);
illegalBuilding.setBaseCaseId(id);
@@ -318,7 +318,7 @@
}
@Override
- public void endCase(Integer caseId, String result) {
+ public void endCase(Long caseId, String result) {
AdminUserDetails user = (AdminUserDetails) SecurityContextHolder.getContext().getAuthentication().getPrincipal();
Integer state = 1;
String endCaseName = "缁撴";
@@ -331,7 +331,7 @@
disposeRecord.setWorkflowConfigStepId(workflowConfigStepMapper
.selectOne(new LambdaQueryWrapper<WorkflowConfigStep>().eq(WorkflowConfigStep::getName, endCaseName))
.getWorkflowConfigId());
- disposeRecord.setCreateUser(user.getUserId().intValue());
+ disposeRecord.setCreateUser(user.getUserId().longValue());
disposeRecord.setResult(result);
disposeRecord.setState(state);
disposeRecord.setCreateTime(LocalDateTime.now());
diff --git a/ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/CheckHandleServiceImpl.java b/ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/CheckHandleServiceImpl.java
index 33f4d14..6a74ac8 100644
--- a/ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/CheckHandleServiceImpl.java
+++ b/ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/CheckHandleServiceImpl.java
@@ -33,7 +33,7 @@
//鏂板娴佺▼璁板綍淇℃伅
DisposeRecord disposeRecord = new DisposeRecord();
disposeRecord.setBaseCaseId(chechParam.getBaseCaseId());
- disposeRecord.setWorkflowConfigStepId(3);
+ disposeRecord.setWorkflowConfigStepId(3L);
disposeRecord.setState(chechParam.getStatus());
disposeRecord.setCreateUser(chechParam.getCurrentUser());
disposeRecord.setStepName("鏍告煡");
diff --git a/ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/ViolationsServiceImpl.java b/ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/ViolationsServiceImpl.java
index d2016ca..40f34f5 100644
--- a/ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/ViolationsServiceImpl.java
+++ b/ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/ViolationsServiceImpl.java
@@ -1,19 +1,17 @@
package com.ycl.service.caseHandler.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ycl.entity.caseHandler.BaseCase;
import com.ycl.entity.caseHandler.EventSource;
import com.ycl.entity.caseHandler.QuestionCategory;
import com.ycl.entity.caseHandler.Violations;
-import com.ycl.entity.dict.DataDictionary;
import com.ycl.entity.video.VideoAlarmReport;
import com.ycl.entity.video.VideoPoint;
import com.ycl.mapper.caseHandler.ViolationsMapper;
import com.ycl.service.caseHandler.IBaseCaseService;
import com.ycl.service.caseHandler.IViolationsService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ycl.service.video.impl.IVideoPointService;
-import com.ycl.service.video.impl.VideoPointServiceImpl;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -53,7 +51,7 @@
videoPoint = pointList.get(0);
}
BaseCase baseCase = BaseCase.builder().eventSource(EventSource.VIDEO.getCode()).category(QuestionCategory.VIOLATION.getCode())
- .createTime(LocalDateTime.now()).createUser(0).state(1).alarmTime(videoAlarmReport.getAlarmTime()).build();
+ .createTime(LocalDateTime.now()).createUser(0L).state(1).alarmTime(videoAlarmReport.getAlarmTime()).build();
Violations violations = new Violations();
if (videoPoint != null) {
baseCase.setLatitude(videoPoint.getLatitude());
diff --git a/ycl-platform/src/main/java/com/ycl/service/message/IMessageService.java b/ycl-platform/src/main/java/com/ycl/service/message/IMessageService.java
new file mode 100644
index 0000000..24ae67d
--- /dev/null
+++ b/ycl-platform/src/main/java/com/ycl/service/message/IMessageService.java
@@ -0,0 +1,18 @@
+package com.ycl.service.message;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ycl.dto.message.MessageParam;
+import com.ycl.entity.message.Message;
+
+/**
+ * <p>
+ * 娑堟伅鏈嶅姟绫�
+ * </p>
+ *
+ * @author mg
+ * @since 2022-10-08
+ */
+public interface IMessageService extends IService<Message> {
+
+ Message sendMessage(MessageParam messageParam);
+}
diff --git a/ycl-platform/src/main/java/com/ycl/service/message/impl/IMessageServiceImpl.java b/ycl-platform/src/main/java/com/ycl/service/message/impl/IMessageServiceImpl.java
new file mode 100644
index 0000000..da47266
--- /dev/null
+++ b/ycl-platform/src/main/java/com/ycl/service/message/impl/IMessageServiceImpl.java
@@ -0,0 +1,33 @@
+package com.ycl.service.message.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ycl.dto.message.MessageParam;
+import com.ycl.entity.message.Message;
+import com.ycl.mapper.message.MessageMapper;
+import com.ycl.service.message.IMessageService;
+import org.springframework.beans.BeanUtils;
+import org.springframework.stereotype.Service;
+
+import java.util.Date;
+
+/**
+ * <p>
+ * 鏈嶅姟瀹炵幇绫�
+ * </p>
+ *
+ * @author mg
+ * @since 2022-10-08
+ */
+@Service
+public class IMessageServiceImpl extends ServiceImpl<MessageMapper, Message> implements IMessageService {
+ @Override
+ public Message sendMessage(MessageParam mssageParam) {
+ Message message = new Message();
+ BeanUtils.copyProperties(mssageParam, message);
+ //鐢熸垚榛樿鍙傛暟
+ message.setCreateTime(new Date());
+ message.setUpdateTime(new Date());
+ baseMapper.insert(message);
+ return message;
+ }
+}
--
Gitblit v1.8.0