diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/RealtimeWorkController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/RealtimeWorkController.java
index 4319103..9e9bbbc 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/RealtimeWorkController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/RealtimeWorkController.java
@@ -89,6 +89,18 @@
return ResponseData.success(realtimeWorkService.statisticsByTime(commonRequest));
}
+
+
+ /**
+ * 舆情数据区域汇总接口
+ */
+ @RequestMapping(value = "/statisticsByDept")
+ @ResponseBody
+ public Object statisticsByDept(@RequestBody @Valid CommonRequest commonRequest) {
+ return ResponseData.success(realtimeWorkService.statisticsByDept(commonRequest));
+ }
+
+
/**
* 修改实时工作情况
*/
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/RealtimeWorkController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/RealtimeWorkController.java
index 4319103..9e9bbbc 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/RealtimeWorkController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/RealtimeWorkController.java
@@ -89,6 +89,18 @@
return ResponseData.success(realtimeWorkService.statisticsByTime(commonRequest));
}
+
+
+ /**
+ * 舆情数据区域汇总接口
+ */
+ @RequestMapping(value = "/statisticsByDept")
+ @ResponseBody
+ public Object statisticsByDept(@RequestBody @Valid CommonRequest commonRequest) {
+ return ResponseData.success(realtimeWorkService.statisticsByDept(commonRequest));
+ }
+
+
/**
* 修改实时工作情况
*/
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java
index 8791cf1..edd61ea 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java
@@ -5,20 +5,22 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.casic.missiles.core.base.controller.ExportController;
import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
import com.casic.missiles.model.response.ResponseData;
import com.casic.missiles.modular.system.dto.IdDTO;
import com.casic.missiles.modular.system.enums.BusinessExceptionEnum;
import com.casic.missiles.modular.system.exception.BusinessException;
-import com.casic.missiles.modular.system.model.Judgment;
import com.casic.missiles.modular.system.model.Summary;
import com.casic.missiles.modular.system.service.ISummaryService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
+import org.springframework.validation.BindingResult;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.ResponseBody;
+import javax.validation.Valid;
import java.util.HashMap;
import java.util.List;
import java.util.Objects;
@@ -71,8 +73,11 @@
*/
@RequestMapping(value = "/delete")
@ResponseBody
- public Object delete(@RequestParam String summaryId) {
- return summaryService.delete(summaryId);
+ public Object delete(@RequestBody @Valid IdDTO idDTO) {
+ Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+ throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+ });
+ return summaryService.delete(idDTO.getId());
}
/**
@@ -89,7 +94,10 @@
*/
@RequestMapping(value = "/update")
@ResponseBody
- public Object update(Summary summary) {
+ public Object update(@RequestBody Summary summary, BindingResult bindingResult) {
+ Assert.isFalse(bindingResult.hasErrors(), () -> {
+ throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+ });
return summaryService.update(summary);
}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/RealtimeWorkController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/RealtimeWorkController.java
index 4319103..9e9bbbc 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/RealtimeWorkController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/RealtimeWorkController.java
@@ -89,6 +89,18 @@
return ResponseData.success(realtimeWorkService.statisticsByTime(commonRequest));
}
+
+
+ /**
+ * 舆情数据区域汇总接口
+ */
+ @RequestMapping(value = "/statisticsByDept")
+ @ResponseBody
+ public Object statisticsByDept(@RequestBody @Valid CommonRequest commonRequest) {
+ return ResponseData.success(realtimeWorkService.statisticsByDept(commonRequest));
+ }
+
+
/**
* 修改实时工作情况
*/
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java
index 8791cf1..edd61ea 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java
@@ -5,20 +5,22 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.casic.missiles.core.base.controller.ExportController;
import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
import com.casic.missiles.model.response.ResponseData;
import com.casic.missiles.modular.system.dto.IdDTO;
import com.casic.missiles.modular.system.enums.BusinessExceptionEnum;
import com.casic.missiles.modular.system.exception.BusinessException;
-import com.casic.missiles.modular.system.model.Judgment;
import com.casic.missiles.modular.system.model.Summary;
import com.casic.missiles.modular.system.service.ISummaryService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
+import org.springframework.validation.BindingResult;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.ResponseBody;
+import javax.validation.Valid;
import java.util.HashMap;
import java.util.List;
import java.util.Objects;
@@ -71,8 +73,11 @@
*/
@RequestMapping(value = "/delete")
@ResponseBody
- public Object delete(@RequestParam String summaryId) {
- return summaryService.delete(summaryId);
+ public Object delete(@RequestBody @Valid IdDTO idDTO) {
+ Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+ throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+ });
+ return summaryService.delete(idDTO.getId());
}
/**
@@ -89,7 +94,10 @@
*/
@RequestMapping(value = "/update")
@ResponseBody
- public Object update(Summary summary) {
+ public Object update(@RequestBody Summary summary, BindingResult bindingResult) {
+ Assert.isFalse(bindingResult.hasErrors(), () -> {
+ throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+ });
return summaryService.update(summary);
}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/RealtimeWorkMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/RealtimeWorkMapper.java
index 476c372..8d9d1f6 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/RealtimeWorkMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/RealtimeWorkMapper.java
@@ -3,6 +3,11 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.casic.missiles.modular.system.model.RealtimeWork;
+import com.casic.missiles.modular.system.model.Summary;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.HashMap;
+import java.util.List;
/**
*
@@ -14,4 +19,8 @@
*/
public interface RealtimeWorkMapper extends BaseMapper {
+
+ List statisticsByDept();
+
+
}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/RealtimeWorkController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/RealtimeWorkController.java
index 4319103..9e9bbbc 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/RealtimeWorkController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/RealtimeWorkController.java
@@ -89,6 +89,18 @@
return ResponseData.success(realtimeWorkService.statisticsByTime(commonRequest));
}
+
+
+ /**
+ * 舆情数据区域汇总接口
+ */
+ @RequestMapping(value = "/statisticsByDept")
+ @ResponseBody
+ public Object statisticsByDept(@RequestBody @Valid CommonRequest commonRequest) {
+ return ResponseData.success(realtimeWorkService.statisticsByDept(commonRequest));
+ }
+
+
/**
* 修改实时工作情况
*/
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java
index 8791cf1..edd61ea 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java
@@ -5,20 +5,22 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.casic.missiles.core.base.controller.ExportController;
import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
import com.casic.missiles.model.response.ResponseData;
import com.casic.missiles.modular.system.dto.IdDTO;
import com.casic.missiles.modular.system.enums.BusinessExceptionEnum;
import com.casic.missiles.modular.system.exception.BusinessException;
-import com.casic.missiles.modular.system.model.Judgment;
import com.casic.missiles.modular.system.model.Summary;
import com.casic.missiles.modular.system.service.ISummaryService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
+import org.springframework.validation.BindingResult;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.ResponseBody;
+import javax.validation.Valid;
import java.util.HashMap;
import java.util.List;
import java.util.Objects;
@@ -71,8 +73,11 @@
*/
@RequestMapping(value = "/delete")
@ResponseBody
- public Object delete(@RequestParam String summaryId) {
- return summaryService.delete(summaryId);
+ public Object delete(@RequestBody @Valid IdDTO idDTO) {
+ Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+ throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+ });
+ return summaryService.delete(idDTO.getId());
}
/**
@@ -89,7 +94,10 @@
*/
@RequestMapping(value = "/update")
@ResponseBody
- public Object update(Summary summary) {
+ public Object update(@RequestBody Summary summary, BindingResult bindingResult) {
+ Assert.isFalse(bindingResult.hasErrors(), () -> {
+ throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+ });
return summaryService.update(summary);
}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/RealtimeWorkMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/RealtimeWorkMapper.java
index 476c372..8d9d1f6 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/RealtimeWorkMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/RealtimeWorkMapper.java
@@ -3,6 +3,11 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.casic.missiles.modular.system.model.RealtimeWork;
+import com.casic.missiles.modular.system.model.Summary;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.HashMap;
+import java.util.List;
/**
*
@@ -14,4 +19,8 @@
*/
public interface RealtimeWorkMapper extends BaseMapper {
+
+ List statisticsByDept();
+
+
}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/RealtimeWorkMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/RealtimeWorkMapper.xml
index 2ba2f24..b0a424d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/RealtimeWorkMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/RealtimeWorkMapper.xml
@@ -4,20 +4,27 @@
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
- ID AS id, REPORTED_CONUT AS reportedConut, FIRST_JUDGMENT_COUNT AS firstJudgmentCount, SECOND_LEADER_COUNT AS secondLeaderCount, FIRST_LEADER_COUNT AS firstLeaderCount, SEND_COUNT AS sendCount, FEEDBACK_COUNT AS feedbackCount, CREATE_TIME AS createTime, DESCRIPTION AS description
+ ID
+ AS id, REPORTED_CONUT AS reportedConut, FIRST_JUDGMENT_COUNT AS firstJudgmentCount, SECOND_LEADER_COUNT AS secondLeaderCount, FIRST_LEADER_COUNT AS firstLeaderCount, SEND_COUNT AS sendCount, FEEDBACK_COUNT AS feedbackCount, CREATE_TIME AS createTime, DESCRIPTION AS description
+
+
+
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/RealtimeWorkController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/RealtimeWorkController.java
index 4319103..9e9bbbc 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/RealtimeWorkController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/RealtimeWorkController.java
@@ -89,6 +89,18 @@
return ResponseData.success(realtimeWorkService.statisticsByTime(commonRequest));
}
+
+
+ /**
+ * 舆情数据区域汇总接口
+ */
+ @RequestMapping(value = "/statisticsByDept")
+ @ResponseBody
+ public Object statisticsByDept(@RequestBody @Valid CommonRequest commonRequest) {
+ return ResponseData.success(realtimeWorkService.statisticsByDept(commonRequest));
+ }
+
+
/**
* 修改实时工作情况
*/
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java
index 8791cf1..edd61ea 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java
@@ -5,20 +5,22 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.casic.missiles.core.base.controller.ExportController;
import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
import com.casic.missiles.model.response.ResponseData;
import com.casic.missiles.modular.system.dto.IdDTO;
import com.casic.missiles.modular.system.enums.BusinessExceptionEnum;
import com.casic.missiles.modular.system.exception.BusinessException;
-import com.casic.missiles.modular.system.model.Judgment;
import com.casic.missiles.modular.system.model.Summary;
import com.casic.missiles.modular.system.service.ISummaryService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
+import org.springframework.validation.BindingResult;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.ResponseBody;
+import javax.validation.Valid;
import java.util.HashMap;
import java.util.List;
import java.util.Objects;
@@ -71,8 +73,11 @@
*/
@RequestMapping(value = "/delete")
@ResponseBody
- public Object delete(@RequestParam String summaryId) {
- return summaryService.delete(summaryId);
+ public Object delete(@RequestBody @Valid IdDTO idDTO) {
+ Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+ throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+ });
+ return summaryService.delete(idDTO.getId());
}
/**
@@ -89,7 +94,10 @@
*/
@RequestMapping(value = "/update")
@ResponseBody
- public Object update(Summary summary) {
+ public Object update(@RequestBody Summary summary, BindingResult bindingResult) {
+ Assert.isFalse(bindingResult.hasErrors(), () -> {
+ throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+ });
return summaryService.update(summary);
}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/RealtimeWorkMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/RealtimeWorkMapper.java
index 476c372..8d9d1f6 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/RealtimeWorkMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/RealtimeWorkMapper.java
@@ -3,6 +3,11 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.casic.missiles.modular.system.model.RealtimeWork;
+import com.casic.missiles.modular.system.model.Summary;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.HashMap;
+import java.util.List;
/**
*
@@ -14,4 +19,8 @@
*/
public interface RealtimeWorkMapper extends BaseMapper {
+
+ List statisticsByDept();
+
+
}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/RealtimeWorkMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/RealtimeWorkMapper.xml
index 2ba2f24..b0a424d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/RealtimeWorkMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/RealtimeWorkMapper.xml
@@ -4,20 +4,27 @@
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
- ID AS id, REPORTED_CONUT AS reportedConut, FIRST_JUDGMENT_COUNT AS firstJudgmentCount, SECOND_LEADER_COUNT AS secondLeaderCount, FIRST_LEADER_COUNT AS firstLeaderCount, SEND_COUNT AS sendCount, FEEDBACK_COUNT AS feedbackCount, CREATE_TIME AS createTime, DESCRIPTION AS description
+ ID
+ AS id, REPORTED_CONUT AS reportedConut, FIRST_JUDGMENT_COUNT AS firstJudgmentCount, SECOND_LEADER_COUNT AS secondLeaderCount, FIRST_LEADER_COUNT AS firstLeaderCount, SEND_COUNT AS sendCount, FEEDBACK_COUNT AS feedbackCount, CREATE_TIME AS createTime, DESCRIPTION AS description
+
+
+
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/enums/DictEnum.java b/casic-server/src/main/java/com/casic/missiles/modular/system/enums/DictEnum.java
index 1b4ea0b..c81994f 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/enums/DictEnum.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/enums/DictEnum.java
@@ -16,6 +16,6 @@
String PLATE = "plate";
//一级标签
String FIRST_TAG = "tags";
- //测试状态
+ //下发
String PROCESS_SEND = "4";
}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/RealtimeWorkController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/RealtimeWorkController.java
index 4319103..9e9bbbc 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/RealtimeWorkController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/RealtimeWorkController.java
@@ -89,6 +89,18 @@
return ResponseData.success(realtimeWorkService.statisticsByTime(commonRequest));
}
+
+
+ /**
+ * 舆情数据区域汇总接口
+ */
+ @RequestMapping(value = "/statisticsByDept")
+ @ResponseBody
+ public Object statisticsByDept(@RequestBody @Valid CommonRequest commonRequest) {
+ return ResponseData.success(realtimeWorkService.statisticsByDept(commonRequest));
+ }
+
+
/**
* 修改实时工作情况
*/
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java
index 8791cf1..edd61ea 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java
@@ -5,20 +5,22 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.casic.missiles.core.base.controller.ExportController;
import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
import com.casic.missiles.model.response.ResponseData;
import com.casic.missiles.modular.system.dto.IdDTO;
import com.casic.missiles.modular.system.enums.BusinessExceptionEnum;
import com.casic.missiles.modular.system.exception.BusinessException;
-import com.casic.missiles.modular.system.model.Judgment;
import com.casic.missiles.modular.system.model.Summary;
import com.casic.missiles.modular.system.service.ISummaryService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
+import org.springframework.validation.BindingResult;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.ResponseBody;
+import javax.validation.Valid;
import java.util.HashMap;
import java.util.List;
import java.util.Objects;
@@ -71,8 +73,11 @@
*/
@RequestMapping(value = "/delete")
@ResponseBody
- public Object delete(@RequestParam String summaryId) {
- return summaryService.delete(summaryId);
+ public Object delete(@RequestBody @Valid IdDTO idDTO) {
+ Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+ throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+ });
+ return summaryService.delete(idDTO.getId());
}
/**
@@ -89,7 +94,10 @@
*/
@RequestMapping(value = "/update")
@ResponseBody
- public Object update(Summary summary) {
+ public Object update(@RequestBody Summary summary, BindingResult bindingResult) {
+ Assert.isFalse(bindingResult.hasErrors(), () -> {
+ throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+ });
return summaryService.update(summary);
}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/RealtimeWorkMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/RealtimeWorkMapper.java
index 476c372..8d9d1f6 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/RealtimeWorkMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/RealtimeWorkMapper.java
@@ -3,6 +3,11 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.casic.missiles.modular.system.model.RealtimeWork;
+import com.casic.missiles.modular.system.model.Summary;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.HashMap;
+import java.util.List;
/**
*
@@ -14,4 +19,8 @@
*/
public interface RealtimeWorkMapper extends BaseMapper {
+
+ List statisticsByDept();
+
+
}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/RealtimeWorkMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/RealtimeWorkMapper.xml
index 2ba2f24..b0a424d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/RealtimeWorkMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/RealtimeWorkMapper.xml
@@ -4,20 +4,27 @@
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
- ID AS id, REPORTED_CONUT AS reportedConut, FIRST_JUDGMENT_COUNT AS firstJudgmentCount, SECOND_LEADER_COUNT AS secondLeaderCount, FIRST_LEADER_COUNT AS firstLeaderCount, SEND_COUNT AS sendCount, FEEDBACK_COUNT AS feedbackCount, CREATE_TIME AS createTime, DESCRIPTION AS description
+ ID
+ AS id, REPORTED_CONUT AS reportedConut, FIRST_JUDGMENT_COUNT AS firstJudgmentCount, SECOND_LEADER_COUNT AS secondLeaderCount, FIRST_LEADER_COUNT AS firstLeaderCount, SEND_COUNT AS sendCount, FEEDBACK_COUNT AS feedbackCount, CREATE_TIME AS createTime, DESCRIPTION AS description
+
+
+
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/enums/DictEnum.java b/casic-server/src/main/java/com/casic/missiles/modular/system/enums/DictEnum.java
index 1b4ea0b..c81994f 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/enums/DictEnum.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/enums/DictEnum.java
@@ -16,6 +16,6 @@
String PLATE = "plate";
//一级标签
String FIRST_TAG = "tags";
- //测试状态
+ //下发
String PROCESS_SEND = "4";
}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IRealtimeWorkService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IRealtimeWorkService.java
index 7e7e105..ef35e7e 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IRealtimeWorkService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IRealtimeWorkService.java
@@ -5,7 +5,9 @@
import com.baomidou.mybatisplus.extension.service.IService;
import com.casic.missiles.modular.system.dto.CommonRequest;
import com.casic.missiles.modular.system.model.RealtimeWork;
+import org.springframework.web.bind.annotation.RequestBody;
+import javax.validation.Valid;
import java.util.HashMap;
import java.util.List;
@@ -34,4 +36,6 @@
Object detail(String realtimeWorkId);
List> statisticsByTime(CommonRequest commonRequest);
+
+ List> statisticsByDept(@RequestBody @Valid CommonRequest commonRequest);
}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/RealtimeWorkController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/RealtimeWorkController.java
index 4319103..9e9bbbc 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/RealtimeWorkController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/RealtimeWorkController.java
@@ -89,6 +89,18 @@
return ResponseData.success(realtimeWorkService.statisticsByTime(commonRequest));
}
+
+
+ /**
+ * 舆情数据区域汇总接口
+ */
+ @RequestMapping(value = "/statisticsByDept")
+ @ResponseBody
+ public Object statisticsByDept(@RequestBody @Valid CommonRequest commonRequest) {
+ return ResponseData.success(realtimeWorkService.statisticsByDept(commonRequest));
+ }
+
+
/**
* 修改实时工作情况
*/
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java
index 8791cf1..edd61ea 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java
@@ -5,20 +5,22 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.casic.missiles.core.base.controller.ExportController;
import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
import com.casic.missiles.model.response.ResponseData;
import com.casic.missiles.modular.system.dto.IdDTO;
import com.casic.missiles.modular.system.enums.BusinessExceptionEnum;
import com.casic.missiles.modular.system.exception.BusinessException;
-import com.casic.missiles.modular.system.model.Judgment;
import com.casic.missiles.modular.system.model.Summary;
import com.casic.missiles.modular.system.service.ISummaryService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
+import org.springframework.validation.BindingResult;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.ResponseBody;
+import javax.validation.Valid;
import java.util.HashMap;
import java.util.List;
import java.util.Objects;
@@ -71,8 +73,11 @@
*/
@RequestMapping(value = "/delete")
@ResponseBody
- public Object delete(@RequestParam String summaryId) {
- return summaryService.delete(summaryId);
+ public Object delete(@RequestBody @Valid IdDTO idDTO) {
+ Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+ throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+ });
+ return summaryService.delete(idDTO.getId());
}
/**
@@ -89,7 +94,10 @@
*/
@RequestMapping(value = "/update")
@ResponseBody
- public Object update(Summary summary) {
+ public Object update(@RequestBody Summary summary, BindingResult bindingResult) {
+ Assert.isFalse(bindingResult.hasErrors(), () -> {
+ throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+ });
return summaryService.update(summary);
}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/RealtimeWorkMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/RealtimeWorkMapper.java
index 476c372..8d9d1f6 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/RealtimeWorkMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/RealtimeWorkMapper.java
@@ -3,6 +3,11 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.casic.missiles.modular.system.model.RealtimeWork;
+import com.casic.missiles.modular.system.model.Summary;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.HashMap;
+import java.util.List;
/**
*
@@ -14,4 +19,8 @@
*/
public interface RealtimeWorkMapper extends BaseMapper {
+
+ List statisticsByDept();
+
+
}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/RealtimeWorkMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/RealtimeWorkMapper.xml
index 2ba2f24..b0a424d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/RealtimeWorkMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/RealtimeWorkMapper.xml
@@ -4,20 +4,27 @@
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
- ID AS id, REPORTED_CONUT AS reportedConut, FIRST_JUDGMENT_COUNT AS firstJudgmentCount, SECOND_LEADER_COUNT AS secondLeaderCount, FIRST_LEADER_COUNT AS firstLeaderCount, SEND_COUNT AS sendCount, FEEDBACK_COUNT AS feedbackCount, CREATE_TIME AS createTime, DESCRIPTION AS description
+ ID
+ AS id, REPORTED_CONUT AS reportedConut, FIRST_JUDGMENT_COUNT AS firstJudgmentCount, SECOND_LEADER_COUNT AS secondLeaderCount, FIRST_LEADER_COUNT AS firstLeaderCount, SEND_COUNT AS sendCount, FEEDBACK_COUNT AS feedbackCount, CREATE_TIME AS createTime, DESCRIPTION AS description
+
+
+
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/enums/DictEnum.java b/casic-server/src/main/java/com/casic/missiles/modular/system/enums/DictEnum.java
index 1b4ea0b..c81994f 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/enums/DictEnum.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/enums/DictEnum.java
@@ -16,6 +16,6 @@
String PLATE = "plate";
//一级标签
String FIRST_TAG = "tags";
- //测试状态
+ //下发
String PROCESS_SEND = "4";
}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IRealtimeWorkService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IRealtimeWorkService.java
index 7e7e105..ef35e7e 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IRealtimeWorkService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IRealtimeWorkService.java
@@ -5,7 +5,9 @@
import com.baomidou.mybatisplus.extension.service.IService;
import com.casic.missiles.modular.system.dto.CommonRequest;
import com.casic.missiles.modular.system.model.RealtimeWork;
+import org.springframework.web.bind.annotation.RequestBody;
+import javax.validation.Valid;
import java.util.HashMap;
import java.util.List;
@@ -34,4 +36,6 @@
Object detail(String realtimeWorkId);
List> statisticsByTime(CommonRequest commonRequest);
+
+ List> statisticsByDept(@RequestBody @Valid CommonRequest commonRequest);
}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/ISummaryService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/ISummaryService.java
index 47556f4..d71a38e 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/ISummaryService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/ISummaryService.java
@@ -26,7 +26,7 @@
Object batchDelete(List summaryIds);
- Object delete(String summaryId);
+ Object delete(Long summaryId);
Object update(Summary summary);
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/RealtimeWorkController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/RealtimeWorkController.java
index 4319103..9e9bbbc 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/RealtimeWorkController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/RealtimeWorkController.java
@@ -89,6 +89,18 @@
return ResponseData.success(realtimeWorkService.statisticsByTime(commonRequest));
}
+
+
+ /**
+ * 舆情数据区域汇总接口
+ */
+ @RequestMapping(value = "/statisticsByDept")
+ @ResponseBody
+ public Object statisticsByDept(@RequestBody @Valid CommonRequest commonRequest) {
+ return ResponseData.success(realtimeWorkService.statisticsByDept(commonRequest));
+ }
+
+
/**
* 修改实时工作情况
*/
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java
index 8791cf1..edd61ea 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SummaryController.java
@@ -5,20 +5,22 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.casic.missiles.core.base.controller.ExportController;
import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
import com.casic.missiles.model.response.ResponseData;
import com.casic.missiles.modular.system.dto.IdDTO;
import com.casic.missiles.modular.system.enums.BusinessExceptionEnum;
import com.casic.missiles.modular.system.exception.BusinessException;
-import com.casic.missiles.modular.system.model.Judgment;
import com.casic.missiles.modular.system.model.Summary;
import com.casic.missiles.modular.system.service.ISummaryService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
+import org.springframework.validation.BindingResult;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.ResponseBody;
+import javax.validation.Valid;
import java.util.HashMap;
import java.util.List;
import java.util.Objects;
@@ -71,8 +73,11 @@
*/
@RequestMapping(value = "/delete")
@ResponseBody
- public Object delete(@RequestParam String summaryId) {
- return summaryService.delete(summaryId);
+ public Object delete(@RequestBody @Valid IdDTO idDTO) {
+ Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+ throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+ });
+ return summaryService.delete(idDTO.getId());
}
/**
@@ -89,7 +94,10 @@
*/
@RequestMapping(value = "/update")
@ResponseBody
- public Object update(Summary summary) {
+ public Object update(@RequestBody Summary summary, BindingResult bindingResult) {
+ Assert.isFalse(bindingResult.hasErrors(), () -> {
+ throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+ });
return summaryService.update(summary);
}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/RealtimeWorkMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/RealtimeWorkMapper.java
index 476c372..8d9d1f6 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/RealtimeWorkMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/RealtimeWorkMapper.java
@@ -3,6 +3,11 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.casic.missiles.modular.system.model.RealtimeWork;
+import com.casic.missiles.modular.system.model.Summary;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.HashMap;
+import java.util.List;
/**
*
@@ -14,4 +19,8 @@
*/
public interface RealtimeWorkMapper extends BaseMapper {
+
+ List statisticsByDept();
+
+
}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/RealtimeWorkMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/RealtimeWorkMapper.xml
index 2ba2f24..b0a424d 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/RealtimeWorkMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/RealtimeWorkMapper.xml
@@ -4,20 +4,27 @@
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
- ID AS id, REPORTED_CONUT AS reportedConut, FIRST_JUDGMENT_COUNT AS firstJudgmentCount, SECOND_LEADER_COUNT AS secondLeaderCount, FIRST_LEADER_COUNT AS firstLeaderCount, SEND_COUNT AS sendCount, FEEDBACK_COUNT AS feedbackCount, CREATE_TIME AS createTime, DESCRIPTION AS description
+ ID
+ AS id, REPORTED_CONUT AS reportedConut, FIRST_JUDGMENT_COUNT AS firstJudgmentCount, SECOND_LEADER_COUNT AS secondLeaderCount, FIRST_LEADER_COUNT AS firstLeaderCount, SEND_COUNT AS sendCount, FEEDBACK_COUNT AS feedbackCount, CREATE_TIME AS createTime, DESCRIPTION AS description
+
+
+
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/enums/DictEnum.java b/casic-server/src/main/java/com/casic/missiles/modular/system/enums/DictEnum.java
index 1b4ea0b..c81994f 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/enums/DictEnum.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/enums/DictEnum.java
@@ -16,6 +16,6 @@
String PLATE = "plate";
//一级标签
String FIRST_TAG = "tags";
- //测试状态
+ //下发
String PROCESS_SEND = "4";
}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IRealtimeWorkService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IRealtimeWorkService.java
index 7e7e105..ef35e7e 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IRealtimeWorkService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IRealtimeWorkService.java
@@ -5,7 +5,9 @@
import com.baomidou.mybatisplus.extension.service.IService;
import com.casic.missiles.modular.system.dto.CommonRequest;
import com.casic.missiles.modular.system.model.RealtimeWork;
+import org.springframework.web.bind.annotation.RequestBody;
+import javax.validation.Valid;
import java.util.HashMap;
import java.util.List;
@@ -34,4 +36,6 @@
Object detail(String realtimeWorkId);
List> statisticsByTime(CommonRequest commonRequest);
+
+ List> statisticsByDept(@RequestBody @Valid CommonRequest commonRequest);
}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/ISummaryService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/ISummaryService.java
index 47556f4..d71a38e 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/ISummaryService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/ISummaryService.java
@@ -26,7 +26,7 @@
Object batchDelete(List summaryIds);
- Object delete(String summaryId);
+ Object delete(Long summaryId);
Object update(Summary summary);
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/RealtimeWorkServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/RealtimeWorkServiceImpl.java
index 60fbd5b..db06eff 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/RealtimeWorkServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/RealtimeWorkServiceImpl.java
@@ -6,23 +6,24 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.core.application.service.AbstractDeptService;
import com.casic.missiles.model.response.ResponseData;
import com.casic.missiles.modular.system.dao.RealtimeWorkMapper;
import com.casic.missiles.modular.system.dto.CommonRequest;
import com.casic.missiles.modular.system.enums.DictEnum;
import com.casic.missiles.modular.system.model.BusinessHandleRecord;
import com.casic.missiles.modular.system.model.BusinessReportInfo;
+import com.casic.missiles.modular.system.model.Dept;
import com.casic.missiles.modular.system.model.RealtimeWork;
import com.casic.missiles.modular.system.service.IBusinessHandleRecordService;
import com.casic.missiles.modular.system.service.IBusinessReportInfoService;
import com.casic.missiles.modular.system.service.IRealtimeWorkService;
import org.springframework.stereotype.Service;
+import org.springframework.web.bind.annotation.RequestBody;
import javax.annotation.Resource;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
+import javax.validation.Valid;
+import java.util.*;
/**
*
@@ -42,6 +43,9 @@
@Resource
private IBusinessHandleRecordService businessHandleRecordService;
+ @Resource
+ private AbstractDeptService deptService;
+
@Override
public Object realtimeWorkList(RealtimeWork realtimeWork) {
QueryWrapper wrapper = new QueryWrapper<>();
@@ -172,7 +176,6 @@
return resultMapList;
}
-
@Override
public List> statisticsByTime(CommonRequest commonRequest) {
switch (commonRequest.getTimeType()) {
@@ -184,4 +187,48 @@
return new ArrayList<>();
}
}
+
+ @Override
+ public List> statisticsByDept(@RequestBody @Valid CommonRequest commonRequest) {
+ List> resultMapList = new ArrayList<>();
+
+ List deptList = deptService.getListByTips("");
+ //获取上报数据
+ QueryWrapper queryWrapper = new QueryWrapper<>();
+ queryWrapper.select("REPORT_DEPARTMENT as DEPT,count(*) as SUM");
+ queryWrapper.groupBy("REPORT_DEPARTMENT");
+ List