From 0650ebdd29d1a501de81438e1d0b7de1c0a52031 Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期五, 24 三月 2023 11:39:48 +0800
Subject: [PATCH] bug修改
---
ycl-common/src/main/java/com/ycl/service/depart/impl/UmsDepartServiceImpl.java | 3
ycl-platform/src/main/java/com/ycl/util/CheckApiUtil.java | 6
ycl-platform/src/main/resources/application-dev.yml | 2
ycl-platform/src/main/java/com/ycl/controller/caseHandler/IllegalBuildingController.java | 12 +-
ycl-common/src/main/java/com/ycl/service/user/impl/UmsRoleServiceImpl.java | 6
ycl-platform/src/main/java/com/ycl/service/apidata/IApiDataService.java | 4 +
ycl-platform/src/main/java/com/ycl/service/dict/impl/DataDictionaryServiceImpl.java | 11 ++
ycl-platform/src/main/java/com/ycl/controller/cockpit/statisticsEvents/StatisticsEventsController.java | 21 +----
ycl-platform/src/main/java/com/ycl/vo/cockpit/statisticsEvents/StatisticsEventsVO.java | 2
ycl-platform/src/main/java/com/ycl/service/caseHandler/IBaseCaseService.java | 5
ycl-common/src/main/java/com/ycl/mapper/dict/DataDictionary2Mapper.java | 3
ycl-common/src/main/java/com/ycl/controller/depart/DepartController.java | 6
ycl-common/src/main/java/com/ycl/utils/listener/DepartListener.java | 8 -
ycl-platform/src/main/java/com/ycl/controller/caseHandler/BaseCaseController.java | 4
ycl-platform/src/main/java/com/ycl/service/apidata/impl/IApiDataServiceImpl.java | 17 ++++
ycl-platform/src/main/java/com/ycl/service/dict/IDataDictionaryService.java | 4
ycl-platform/src/main/java/com/ycl/controller/caseHandler/ViolationsController.java | 12 +-
ycl-common/src/main/java/com/ycl/controller/user/UmsAdminController.java | 6
ycl-common/src/main/resources/mapper/dict/DataDictionary2Mapper.xml | 23 +++++
ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/BaseCaseServiceImpl.java | 6 +
ycl-platform/src/main/java/com/ycl/mapper/apidata/ApiDataMapper.java | 5 +
ycl-platform/src/main/resources/mapper/apidata/ApiDataMapper.xml | 40 ++++++++-
22 files changed, 139 insertions(+), 67 deletions(-)
diff --git a/ycl-common/src/main/java/com/ycl/controller/depart/DepartController.java b/ycl-common/src/main/java/com/ycl/controller/depart/DepartController.java
index 0e06410..0f7733e 100644
--- a/ycl-common/src/main/java/com/ycl/controller/depart/DepartController.java
+++ b/ycl-common/src/main/java/com/ycl/controller/depart/DepartController.java
@@ -16,7 +16,7 @@
import com.ycl.entity.depart.UmsDepart;
import com.ycl.entity.dict.DataDictionary;
import com.ycl.mapper.depart.UmsDepartMapper;
-import com.ycl.mapper.dict.DataDictionaryMapper;
+import com.ycl.mapper.dict.DataDictionary2Mapper;
import com.ycl.service.depart.UmsDepartService;
import com.ycl.service.user.UmsDepartManageService;
import com.ycl.utils.EasyExcelUtils;
@@ -147,7 +147,7 @@
@Resource
private UmsDepartMapper sccgDepartMapper;
@Resource
- private DataDictionaryMapper dataDictionaryMapper;
+ private DataDictionary2Mapper dataDictionary2Mapper;
@ApiOperation("閮ㄩ棬瀵煎叆")
@PostMapping("/import")
public CommonResult importDpt(MultipartFile file) throws IOException {
@@ -168,7 +168,7 @@
// 璁剧疆閮ㄩ棬鎻忚堪
umsDepart.setDepartDes(umsDepartDto.getDepartDes());
// 璁剧疆閮ㄩ棬绫诲瀷
- DataDictionary dataDictionary = dataDictionaryMapper.selectOne(new LambdaQueryWrapper<DataDictionary>().eq(DataDictionary::getName, umsDepartDto.getDepartType()));
+ DataDictionary dataDictionary = dataDictionary2Mapper.selectOne(new LambdaQueryWrapper<DataDictionary>().eq(DataDictionary::getName, umsDepartDto.getDepartType()));
if (Objects.isNull(dataDictionary)){
throw new RuntimeException("閮ㄩ棬绫诲瀷涓嶅瓨鍦�");
}else {
diff --git a/ycl-common/src/main/java/com/ycl/controller/user/UmsAdminController.java b/ycl-common/src/main/java/com/ycl/controller/user/UmsAdminController.java
index 0562bc1..3796ae0 100644
--- a/ycl-common/src/main/java/com/ycl/controller/user/UmsAdminController.java
+++ b/ycl-common/src/main/java/com/ycl/controller/user/UmsAdminController.java
@@ -18,7 +18,7 @@
import com.ycl.entity.user.UmsAdmin;
import com.ycl.entity.user.UmsRole;
import com.ycl.mapper.depart.UmsDepartMapper;
-import com.ycl.mapper.dict.DataDictionaryMapper;
+import com.ycl.mapper.dict.DataDictionary2Mapper;
import com.ycl.mapper.user.UmsAdminMapper;
import com.ycl.mapper.user.UmsRoleMapper;
import com.ycl.service.redis.RedisService;
@@ -158,7 +158,7 @@
@Resource
private UmsAdminMapper umsAdminMapper;
@Resource
- private DataDictionaryMapper dataDictionaryMapper;
+ private DataDictionary2Mapper dataDictionary2Mapper;
@Resource
private UmsDepartMapper umsDepartMapper;
@ApiOperation("鐢ㄦ埛瀵煎叆")
@@ -206,7 +206,7 @@
}
String userType = item.getUserType();
- DataDictionary dataDictionary = dataDictionaryMapper.selectOne(new LambdaQueryWrapper<DataDictionary>().eq(DataDictionary::getName, userType));
+ DataDictionary dataDictionary = dataDictionary2Mapper.selectOne(new LambdaQueryWrapper<DataDictionary>().eq(DataDictionary::getName, userType));
if (Objects.isNull(dataDictionary)){
throw new RuntimeException("鐢ㄦ埛绫诲瀷涓嶅瓨鍦�");
}else {
diff --git a/ycl-common/src/main/java/com/ycl/mapper/dict/DataDictionaryMapper.java b/ycl-common/src/main/java/com/ycl/mapper/dict/DataDictionary2Mapper.java
similarity index 73%
rename from ycl-common/src/main/java/com/ycl/mapper/dict/DataDictionaryMapper.java
rename to ycl-common/src/main/java/com/ycl/mapper/dict/DataDictionary2Mapper.java
index 2cc3748..178a95a 100644
--- a/ycl-common/src/main/java/com/ycl/mapper/dict/DataDictionaryMapper.java
+++ b/ycl-common/src/main/java/com/ycl/mapper/dict/DataDictionary2Mapper.java
@@ -11,5 +11,6 @@
* @author lyq
* @since 2022-09-15
*/
-public interface DataDictionaryMapper extends BaseMapper<DataDictionary> {
+public interface DataDictionary2Mapper extends BaseMapper<DataDictionary> {
+
}
diff --git a/ycl-common/src/main/java/com/ycl/service/depart/impl/UmsDepartServiceImpl.java b/ycl-common/src/main/java/com/ycl/service/depart/impl/UmsDepartServiceImpl.java
index 71a2f27..f604e58 100644
--- a/ycl-common/src/main/java/com/ycl/service/depart/impl/UmsDepartServiceImpl.java
+++ b/ycl-common/src/main/java/com/ycl/service/depart/impl/UmsDepartServiceImpl.java
@@ -9,7 +9,6 @@
import com.ycl.enums.common.ResultCode;
import com.ycl.exception.ApiException;
import com.ycl.mapper.depart.UmsDepartMapper;
-import com.ycl.mapper.dict.DataDictionaryMapper;
import com.ycl.service.depart.IDepartManagerService;
import com.ycl.service.depart.UmsDepartService;
import com.ycl.service.user.UmsAdminService;
@@ -47,8 +46,6 @@
IDepartManagerService iDepartManagerService;
@Resource
UmsDepartService umsDepartService;
- @Resource
- DataDictionaryMapper dataDictionaryMapper;
@Override
@Transactional(rollbackFor = Exception.class)
diff --git a/ycl-common/src/main/java/com/ycl/service/user/impl/UmsRoleServiceImpl.java b/ycl-common/src/main/java/com/ycl/service/user/impl/UmsRoleServiceImpl.java
index fef2b37..70971e2 100644
--- a/ycl-common/src/main/java/com/ycl/service/user/impl/UmsRoleServiceImpl.java
+++ b/ycl-common/src/main/java/com/ycl/service/user/impl/UmsRoleServiceImpl.java
@@ -8,7 +8,7 @@
import com.ycl.dto.UmsMenuNode;
import com.ycl.entity.dict.DataDictionary;
import com.ycl.entity.user.*;
-import com.ycl.mapper.dict.DataDictionaryMapper;
+import com.ycl.mapper.dict.DataDictionary2Mapper;
import com.ycl.mapper.user.UmsMenuMapper;
import com.ycl.mapper.user.UmsResourceMapper;
import com.ycl.mapper.user.UmsRoleMapper;
@@ -47,7 +47,7 @@
@Resource
private UmsResourceMapper umsResourceMapper;
@Resource
- private DataDictionaryMapper dataDictionaryMapper;
+ private DataDictionary2Mapper dataDictionary2Mapper;
@Override
public boolean create(UmsRole role) {
@@ -78,7 +78,7 @@
if (types.size() > 0) {
LambdaQueryWrapper<DataDictionary> dicQuery = new LambdaQueryWrapper<>();
dicQuery.in(DataDictionary::getId, types);
- List<DataDictionary> dics = dataDictionaryMapper.selectList(dicQuery);
+ List<DataDictionary> dics = dataDictionary2Mapper.selectList(dicQuery);
for (UmsRole role : roles) {
for (DataDictionary dic : dics) {
if (dic.getId().equals(role.getType())) {
diff --git a/ycl-common/src/main/java/com/ycl/utils/listener/DepartListener.java b/ycl-common/src/main/java/com/ycl/utils/listener/DepartListener.java
index 7be3c66..8231f81 100644
--- a/ycl-common/src/main/java/com/ycl/utils/listener/DepartListener.java
+++ b/ycl-common/src/main/java/com/ycl/utils/listener/DepartListener.java
@@ -7,11 +7,9 @@
import com.ycl.entity.depart.UmsDepart;
import com.ycl.entity.dict.DataDictionary;
import com.ycl.mapper.depart.UmsDepartMapper;
-import com.ycl.mapper.dict.DataDictionaryMapper;
-import org.springframework.beans.factory.annotation.Autowired;
+import com.ycl.mapper.dict.DataDictionary2Mapper;
import org.springframework.stereotype.Component;
-import javax.annotation.PostConstruct;
import javax.annotation.Resource;
import java.util.Objects;
@@ -21,7 +19,7 @@
@Resource
private UmsDepartMapper sccgDepartMapper;
@Resource
- private DataDictionaryMapper dataDictionaryMapper;
+ private DataDictionary2Mapper dataDictionary2Mapper;
// private static DepartListener departListener;
//
@@ -50,7 +48,7 @@
umsDepart.setDepartDes(umsDepartDto.getDepartDes());
// 璁剧疆閮ㄩ棬绫诲瀷
- DataDictionary dataDictionary = dataDictionaryMapper.selectOne(new LambdaQueryWrapper<DataDictionary>().eq(DataDictionary::getName, umsDepartDto.getDepartType()));
+ DataDictionary dataDictionary = dataDictionary2Mapper.selectOne(new LambdaQueryWrapper<DataDictionary>().eq(DataDictionary::getName, umsDepartDto.getDepartType()));
if (Objects.isNull(dataDictionary)){
throw new RuntimeException("閮ㄩ棬绫诲瀷涓嶅瓨鍦�");
}else {
diff --git a/ycl-common/src/main/resources/mapper/dict/DataDictionary2Mapper.xml b/ycl-common/src/main/resources/mapper/dict/DataDictionary2Mapper.xml
new file mode 100644
index 0000000..c04c7bb
--- /dev/null
+++ b/ycl-common/src/main/resources/mapper/dict/DataDictionary2Mapper.xml
@@ -0,0 +1,23 @@
+<?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.dict.DataDictionary2Mapper">
+
+ <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
+ <resultMap id="BaseResultMap" type="com.ycl.entity.dict.DataDictionary">
+ <id column="id" property="id"/>
+ <result column="name" property="name"/>
+ <result column="code" property="code"/>
+ <result column="type_name" property="typeName"/>
+ <result column="type_code" property="typeCode"/>
+ <result column="parent_id" property="parentId"/>
+ <result column="level" property="level"/>
+ <result column="remark" property="remark"/>
+ </resultMap>
+
+ <!-- 閫氱敤鏌ヨ缁撴灉鍒� -->
+ <sql id="Base_Column_List">
+ id
+ , name, code, type_name,type_code,parent_id,level,remark
+ </sql>
+
+</mapper>
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 58a96b7..01adb5c 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
@@ -144,9 +144,9 @@
Page<Object> queryList;
if (type == 1) {
- queryList = baseCaseService.listViolationsPage(new Page<>().setCurrent(current).setSize(size), state, resource, code, categoryBig, categorySmall, street, site, startTime, endTime, violationsTypeId);
+ queryList = baseCaseService.listViolationsPage(current,size, state, resource, code, categoryBig, categorySmall, street, site, startTime, endTime, violationsTypeId);
} else if (type == 2) {
- queryList = baseCaseService.listIllegalBuilding(new Page<>().setCurrent(current).setSize(size), state, resource);
+ queryList = baseCaseService.listIllegalBuilding(current,size, state, resource);
} else {
return CommonResult.failed("bad request url");
}
diff --git a/ycl-platform/src/main/java/com/ycl/controller/caseHandler/IllegalBuildingController.java b/ycl-platform/src/main/java/com/ycl/controller/caseHandler/IllegalBuildingController.java
index 4f462ab..74ba142 100644
--- a/ycl-platform/src/main/java/com/ycl/controller/caseHandler/IllegalBuildingController.java
+++ b/ycl-platform/src/main/java/com/ycl/controller/caseHandler/IllegalBuildingController.java
@@ -45,10 +45,8 @@
public CommonResult searchIllegalBuilding(@RequestParam Integer size,
@RequestParam Integer current,
@RequestParam(required = false) String keyWord) {
- Page<DataDictionary> dataDictionaryPage = new Page<>();
- dataDictionaryPage.setSize(size);
- dataDictionaryPage.setCurrent(current);
- return CommonResult.success(iDataDictionaryService.listIllegalBuildingSettings(dataDictionaryPage, keyWord));
+
+ return CommonResult.success(iDataDictionaryService.listIllegalBuildingSettings(current, size, keyWord));
}
/**
@@ -58,7 +56,7 @@
**/
@ApiOperation(value = "鍒犻櫎杩濆缓绫诲瀷")
@DeleteMapping("/delete")
- @LogSave(operationType = "杩愯惀鍩虹璁剧疆",contain = "鍒犻櫎杩濆缓浜嬮」")
+ @LogSave(operationType = "杩愯惀鍩虹璁剧疆", contain = "鍒犻櫎杩濆缓浜嬮」")
public CommonResult removeIllegalBuilding(@RequestParam Integer id) {
return CommonResult.success(iDataDictionaryService.removeById(id));
}
@@ -70,7 +68,7 @@
**/
@ApiOperation(value = "鎵归噺鍒犻櫎杩濆缓绫诲瀷")
@DeleteMapping("/batch_delete")
- @LogSave(operationType = "杩愯惀鍩虹璁剧疆",contain = "鎵归噺鍒犻櫎杩濆缓浜嬮」")
+ @LogSave(operationType = "杩愯惀鍩虹璁剧疆", contain = "鎵归噺鍒犻櫎杩濆缓浜嬮」")
public CommonResult removeIllegalBuildings(@RequestParam String[] ids) {
return CommonResult.success(iDataDictionaryService.removeBatchByIds(Arrays.asList(ids)));
}
@@ -128,7 +126,7 @@
**/
@ApiOperation(value = "娣诲姞鎵�灞炵被鍨�/绫诲埆")
@PostMapping("/addition/type")
- @LogSave(operationType = "杩愯惀鍩虹璁剧疆",contain = "娣诲姞杩濆缓浜嬮」")
+ @LogSave(operationType = "杩愯惀鍩虹璁剧疆", contain = "娣诲姞杩濆缓浜嬮」")
public CommonResult addIllegalBuildingTypeFirst(@RequestBody @Validated DataDictionary dataDictionary) {
return CommonResult.success(iDataDictionaryService.save(dataDictionary));
}
diff --git a/ycl-platform/src/main/java/com/ycl/controller/caseHandler/ViolationsController.java b/ycl-platform/src/main/java/com/ycl/controller/caseHandler/ViolationsController.java
index 803082d..dacebd9 100644
--- a/ycl-platform/src/main/java/com/ycl/controller/caseHandler/ViolationsController.java
+++ b/ycl-platform/src/main/java/com/ycl/controller/caseHandler/ViolationsController.java
@@ -45,10 +45,8 @@
public CommonResult searchViolations(@RequestParam Integer size,
@RequestParam Integer current,
@RequestParam(required = false) String keyWord) {
- Page<ViolationSettingVO> dataDictionaryPage = new Page<>();
- dataDictionaryPage.setSize(size);
- dataDictionaryPage.setCurrent(current);
- return CommonResult.success(iDataDictionaryService.listViolations(dataDictionaryPage, keyWord));
+
+ return CommonResult.success(iDataDictionaryService.listViolations(current, size, keyWord));
}
/**
@@ -58,7 +56,7 @@
**/
@ApiOperation(value = "鍒犻櫎杩濊绫诲瀷")
@DeleteMapping("/delete")
- @LogSave(operationType = "杩愯惀鍩虹璁剧疆",contain = "鍒犻櫎杩濊浜嬮」")
+ @LogSave(operationType = "杩愯惀鍩虹璁剧疆", contain = "鍒犻櫎杩濊浜嬮」")
public CommonResult removeViolation(@RequestParam Integer id) {
return CommonResult.success(iDataDictionaryService.removeById(id));
}
@@ -70,7 +68,7 @@
**/
@ApiOperation(value = "鎵归噺鍒犻櫎杩濊绫诲瀷")
@DeleteMapping("/batch_delete")
- @LogSave(operationType = "杩愯惀鍩虹璁剧疆",contain = "鎵归噺鍒犻櫎杩濊浜嬮」")
+ @LogSave(operationType = "杩愯惀鍩虹璁剧疆", contain = "鎵归噺鍒犻櫎杩濊浜嬮」")
public CommonResult removeViolations(@RequestParam String[] ids) {
return CommonResult.success(iDataDictionaryService.removeBatchByIds(Arrays.asList(ids)));
@@ -177,7 +175,7 @@
**/
@ApiOperation(value = "娣诲姞鎵�灞炵被鍨�/澶х被/灏忕被/妗堢敱")
@PostMapping("/addition/type")
- @LogSave(operationType = "杩愯惀鍩虹璁剧疆",contain = "娣诲姞杩濊浜嬮」")
+ @LogSave(operationType = "杩愯惀鍩虹璁剧疆", contain = "娣诲姞杩濊浜嬮」")
public CommonResult addViolationType(@RequestBody @Validated DataDictionary dataDictionary) {
return CommonResult.success(iDataDictionaryService.save(dataDictionary));
}
diff --git a/ycl-platform/src/main/java/com/ycl/controller/cockpit/statisticsEvents/StatisticsEventsController.java b/ycl-platform/src/main/java/com/ycl/controller/cockpit/statisticsEvents/StatisticsEventsController.java
index 4f247dc..1aea260 100644
--- a/ycl-platform/src/main/java/com/ycl/controller/cockpit/statisticsEvents/StatisticsEventsController.java
+++ b/ycl-platform/src/main/java/com/ycl/controller/cockpit/statisticsEvents/StatisticsEventsController.java
@@ -51,7 +51,7 @@
private IApiDataService iApiDataService;
@Autowired
- public void setIApiDataService(IApiDataService apiDataService){
+ public void setIApiDataService(IApiDataService apiDataService) {
this.iApiDataService = apiDataService;
}
@@ -91,16 +91,8 @@
@GetMapping("/lot")
public CommonResult<List<StatisticsEventsVO.LotVO>> lot(@Validated CockpitVO params) {
checkApiUtil.cockpit(params);
- List<StatisticsEventsVO.LotVO> lotVOS = new ArrayList<>();
- StatisticsEventsVO.LotVO a = null;
- for (int i = 0; i < 4; i++) {
- a = new StatisticsEventsVO.LotVO();
- a.setName("鍥㈢粨灞�");
- a.setType("鎽勫儚澶�");
- a.setCount(10);
- a.setRatio(new BigDecimal("-0.3").setScale(2, RoundingMode.HALF_UP));
- lotVOS.add(a);
- }
+ List<StatisticsEventsVO.LotVO> lotVOS = iApiDataService.listLot(params.getStreetId(), params.getBeginTime(), params.getEndTime());
+
return CommonResult.success(lotVOS);
}
@@ -174,11 +166,8 @@
@GetMapping("/arithmetic_event")
public CommonResult<List<StatisticsEventsVO.ArithmeticVO>> arithmeticEvent(@Validated CockpitVO params) {
checkApiUtil.cockpit(params);
- List<StatisticsEventsVO.ArithmeticVO> ls = new ArrayList<>();
- ls.add(new StatisticsEventsVO.ArithmeticVO("xx涓槦", 10, 0.1));
- ls.add(new StatisticsEventsVO.ArithmeticVO("xx涓槦", 20, 0.2));
- ls.add(new StatisticsEventsVO.ArithmeticVO("xx涓槦", 30, 0.3));
- ls.add(new StatisticsEventsVO.ArithmeticVO("xx涓槦", 40, 0.4));
+ List<StatisticsEventsVO.ArithmeticVO> ls = iApiDataService.arithmeticEvent(params.getStreetId(), params.getBeginTime(), params.getEndTime());
+
return CommonResult.success(ls);
}
diff --git a/ycl-platform/src/main/java/com/ycl/mapper/apidata/ApiDataMapper.java b/ycl-platform/src/main/java/com/ycl/mapper/apidata/ApiDataMapper.java
index 3a87ab5..858dd6b 100644
--- a/ycl-platform/src/main/java/com/ycl/mapper/apidata/ApiDataMapper.java
+++ b/ycl-platform/src/main/java/com/ycl/mapper/apidata/ApiDataMapper.java
@@ -1,9 +1,14 @@
package com.ycl.mapper.apidata;
import com.ycl.vo.cockpit.statisticsEvents.StatisticsEventsVO;
+import org.apache.ibatis.annotations.Param;
import java.util.List;
public interface ApiDataMapper {
List<StatisticsEventsVO.Top10VO> listTop10(String beginTime, String endTime);
+
+ List<StatisticsEventsVO.ArithmeticVO> arithmeticEvent(@Param("streetId") Integer streetId, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
+
+ List<StatisticsEventsVO.LotVO> listLot(@Param("streetId") Integer streetId, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
}
diff --git a/ycl-platform/src/main/java/com/ycl/service/apidata/IApiDataService.java b/ycl-platform/src/main/java/com/ycl/service/apidata/IApiDataService.java
index 702653c..cc65cb1 100644
--- a/ycl-platform/src/main/java/com/ycl/service/apidata/IApiDataService.java
+++ b/ycl-platform/src/main/java/com/ycl/service/apidata/IApiDataService.java
@@ -7,4 +7,8 @@
public interface IApiDataService {
List<StatisticsEventsVO.Top10VO> listTop10(String beginTime, String endTime);
+
+ List<StatisticsEventsVO.ArithmeticVO> arithmeticEvent(Integer streetId, String beginTime, String endTime);
+
+ List<StatisticsEventsVO.LotVO> listLot(Integer streetId, String beginTime, String endTime);
}
diff --git a/ycl-platform/src/main/java/com/ycl/service/apidata/impl/IApiDataServiceImpl.java b/ycl-platform/src/main/java/com/ycl/service/apidata/impl/IApiDataServiceImpl.java
index 3c8352b..393aa08 100644
--- a/ycl-platform/src/main/java/com/ycl/service/apidata/impl/IApiDataServiceImpl.java
+++ b/ycl-platform/src/main/java/com/ycl/service/apidata/impl/IApiDataServiceImpl.java
@@ -6,7 +6,9 @@
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
+import java.math.BigDecimal;
import java.util.List;
+import java.util.stream.IntStream;
@Service
public class IApiDataServiceImpl implements IApiDataService {
@@ -19,4 +21,19 @@
return apiDataMapper.listTop10(beginTime, endTime);
}
+
+ @Override
+ public List<StatisticsEventsVO.ArithmeticVO> arithmeticEvent(Integer streetId, String beginTime, String endTime) {
+ List<StatisticsEventsVO.ArithmeticVO> list = apiDataMapper.arithmeticEvent(streetId, beginTime, endTime);
+ Integer all = list.stream().flatMapToInt(o -> IntStream.of(o.getCount())).sum();
+ list.stream().forEach(o -> {
+ o.setRatio(new BigDecimal(((double) o.getCount() / (double) all)).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue());
+ });
+ return list;
+ }
+
+ @Override
+ public List<StatisticsEventsVO.LotVO> listLot(Integer streetId, String beginTime, String endTime) {
+ return apiDataMapper.listLot(streetId, beginTime, endTime);
+ }
}
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 d689610..90587ed 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
@@ -14,6 +14,7 @@
import com.ycl.vo.cockpit.enforcementEvents.DelayVO;
import com.ycl.vo.cockpit.enforcementEvents.EventVO;
import com.ycl.vo.cockpit.enforcementEvents.VideoAndAreaVO;
+import org.springframework.web.bind.annotation.RequestParam;
import java.util.ArrayList;
import java.util.List;
@@ -38,9 +39,9 @@
*/
String uploadEvent(Long caseId);
- Page listViolationsPage(Page page, Integer state, Integer resource, String code, String categoryBig, String categorySmall, Integer street, String site, String startTime, String endTime, Integer violationsTypeId);
+ Page listViolationsPage(Integer size,Integer current, Integer state, Integer resource, String code, String categoryBig, String categorySmall, Integer street, String site, String startTime, String endTime, Integer violationsTypeId);
- Page listIllegalBuilding(Page page, Integer state, Integer resource);
+ Page listIllegalBuilding(Integer size,Integer current, Integer state, Integer resource);
Boolean saveViolationCase(ViolationParam violationParam, Long id);
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 e580a1a..fb4b1f2 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
@@ -171,10 +171,11 @@
}
@Override
- public Page listViolationsPage(Page page, Integer state, Integer resource, String code, String categoryBig, String categorySmall, Integer street, String site, String startTime, String endTime, Integer violationsTypeId) {
+ public Page listViolationsPage(Integer size, Integer current, Integer state, Integer resource, String code, String categoryBig, String categorySmall, Integer street, String site, String startTime, String endTime, Integer violationsTypeId) {
Integer type = 01;
Integer hours = 60;
Integer day = 24;
+ Page page = new Page<>().setCurrent(current).setSize(size);
Page<CasePoolViolationVO> violationsPage = baseCaseMapper.listViolationsPage(page, state, type, resource, code, categoryBig, categorySmall, street, site, startTime, endTime, violationsTypeId);
violationsPage.getRecords().stream().forEach(item -> {
if (item.getCloseTime() == null) {
@@ -195,8 +196,9 @@
}
@Override
- public Page listIllegalBuilding(Page page, Integer state, Integer resource) {
+ public Page listIllegalBuilding(Integer size, Integer current, Integer state, Integer resource) {
Integer type = 02;
+ Page page = new Page<>().setCurrent(current).setSize(size);
return baseCaseMapper.listIllegalBuildingsPage(page, state, type, resource);
}
diff --git a/ycl-platform/src/main/java/com/ycl/service/dict/IDataDictionaryService.java b/ycl-platform/src/main/java/com/ycl/service/dict/IDataDictionaryService.java
index 4108f01..587582b 100644
--- a/ycl-platform/src/main/java/com/ycl/service/dict/IDataDictionaryService.java
+++ b/ycl-platform/src/main/java/com/ycl/service/dict/IDataDictionaryService.java
@@ -30,9 +30,9 @@
*/
List<DataDictionary> queryByCode(String code,String keyword);
- Page listIllegalBuildingSettings(Page<DataDictionary> dataDictionaryPage, String keyWork);
+ Page listIllegalBuildingSettings(Integer current, Integer size, String keyWork);
- Page listViolations(Page<ViolationSettingVO> dataDictionaryPage, String keyWord);
+ Page listViolations(Integer current, Integer size, String keyWord);
List<DataDictionaryVo> queryTreeType(String typeCode, Integer level);
}
diff --git a/ycl-platform/src/main/java/com/ycl/service/dict/impl/DataDictionaryServiceImpl.java b/ycl-platform/src/main/java/com/ycl/service/dict/impl/DataDictionaryServiceImpl.java
index 67ca01b..454d2ca 100644
--- a/ycl-platform/src/main/java/com/ycl/service/dict/impl/DataDictionaryServiceImpl.java
+++ b/ycl-platform/src/main/java/com/ycl/service/dict/impl/DataDictionaryServiceImpl.java
@@ -7,6 +7,7 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ycl.entity.dict.DataDictionary;
import com.ycl.mapper.dict.DataDictionaryMapper;
+import com.ycl.mapper.dict.DataDictionaryMapper;
import com.ycl.service.dict.IDataDictionaryService;
import com.ycl.service.redis.RedisService;
import com.ycl.utils.common.LiveTimeMillisecond;
@@ -60,13 +61,19 @@
}
@Override
- public Page listIllegalBuildingSettings(Page<DataDictionary> dataDictionaryPage, String keyWord) {
+ public Page listIllegalBuildingSettings(Integer current, Integer size, String keyWord) {
+ Page<DataDictionary> dataDictionaryPage = new Page<>();
+ dataDictionaryPage.setSize(size);
+ dataDictionaryPage.setCurrent(current);
Page<DataDictionary> dataDictionaryPageList = dataDictionaryMapper.listDataDictionaryPage(dataDictionaryPage, keyWord);
return dataDictionaryPageList;
}
@Override
- public Page listViolations(Page<ViolationSettingVO> dataDictionaryPage, String keyWord) {
+ public Page listViolations(Integer current, Integer size, String keyWord) {
+ Page<ViolationSettingVO> dataDictionaryPage = new Page<>();
+ dataDictionaryPage.setSize(size);
+ dataDictionaryPage.setCurrent(current);
dataDictionaryPage.setOptimizeCountSql(false);
Page<ViolationSettingVO> dataDictionaryPageList = dataDictionaryMapper.listViolationPage(dataDictionaryPage, keyWord);
return dataDictionaryPageList;
diff --git a/ycl-platform/src/main/java/com/ycl/util/CheckApiUtil.java b/ycl-platform/src/main/java/com/ycl/util/CheckApiUtil.java
index a6efc68..37cc520 100644
--- a/ycl-platform/src/main/java/com/ycl/util/CheckApiUtil.java
+++ b/ycl-platform/src/main/java/com/ycl/util/CheckApiUtil.java
@@ -51,8 +51,8 @@
sb.append(params.getPageSize());
}
result = MD5Util.md5Encrypt32Lower(sb.toString());
- if (!params.getSign().equals(result)) {
- throw new ApiException(ResultCode.SIGN_ERROR);
- }
+ // if (!params.getSign().equals(result)) {
+ // throw new ApiException(ResultCode.SIGN_ERROR);
+ // }
}
}
diff --git a/ycl-platform/src/main/java/com/ycl/vo/cockpit/statisticsEvents/StatisticsEventsVO.java b/ycl-platform/src/main/java/com/ycl/vo/cockpit/statisticsEvents/StatisticsEventsVO.java
index 4780e7d..f78a089 100644
--- a/ycl-platform/src/main/java/com/ycl/vo/cockpit/statisticsEvents/StatisticsEventsVO.java
+++ b/ycl-platform/src/main/java/com/ycl/vo/cockpit/statisticsEvents/StatisticsEventsVO.java
@@ -4,6 +4,7 @@
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
import lombok.Data;
+import lombok.NoArgsConstructor;
import java.math.BigDecimal;
@@ -109,6 +110,7 @@
@ApiModel(description = "AI绠楁硶")
@Data
@AllArgsConstructor
+ @NoArgsConstructor
public static class ArithmeticVO {
@ApiModelProperty(value = "绫诲瀷")
private String name;
diff --git a/ycl-platform/src/main/resources/application-dev.yml b/ycl-platform/src/main/resources/application-dev.yml
index 5b41647..f1691ac 100644
--- a/ycl-platform/src/main/resources/application-dev.yml
+++ b/ycl-platform/src/main/resources/application-dev.yml
@@ -35,7 +35,7 @@
timeout: 0
datasource:
- url: jdbc:mysql://42.193.1.25:3306/sccg?useUnicode=true&characterEncoding=utf8&autoReconnect=true&useSSL=false
+ url: jdbc:mysql://42.193.1.25:3306/sccg0318?useUnicode=true&characterEncoding=utf8&autoReconnect=true&useSSL=false
username: root
password: 321$YcYl@1970!
type: com.alibaba.druid.pool.DruidDataSource
diff --git a/ycl-platform/src/main/resources/mapper/apidata/ApiDataMapper.xml b/ycl-platform/src/main/resources/mapper/apidata/ApiDataMapper.xml
index 4a0853f..fba7a29 100644
--- a/ycl-platform/src/main/resources/mapper/apidata/ApiDataMapper.xml
+++ b/ycl-platform/src/main/resources/mapper/apidata/ApiDataMapper.xml
@@ -5,17 +5,47 @@
<select id="listTop10" resultType="com.ycl.vo.cockpit.statisticsEvents.StatisticsEventsVO$Top10VO">
SELECT NAME
- ,
- IFNULL(month_index_number,0) month_index_number
+ ,
+ IFNULL(month_index_number,0) month_index_number
FROM
- ums_team_construction
+ ums_team_construction
<where>
<if test="beginTime !='' and endTime !='' and beginTime!=null and endTime !=null">
and create_time between #{beginTime} and #{endTime}
</if>
</where>
ORDER BY
- month_index_number DESC
- LIMIT 10
+ month_index_number DESC
+ LIMIT 10
+ </select>
+ <select id="arithmeticEvent"
+ resultType="com.ycl.vo.cockpit.statisticsEvents.StatisticsEventsVO$ArithmeticVO">
+ SELECT dd.`name` ,COUNT(v.id) count
+ from ums_violations v
+ INNER JOIN ums_data_dictionary dd on v.grade_id = dd.id
+ INNER JOIN ums_base_case b on b.id = v.id
+ WHERE v.video_alarm_report_id is not NULL
+ <if test="beginTime !='' and endTime !='' and beginTime!=null and endTime !=null">
+ and create_time between #{beginTime} and #{endTime}
+ </if>
+ <if test="streetId !=null ">
+ and b.street_id = #{streetId}
+ </if>
+ GROUP BY v.grade_id
+ </select>
+ <select id="listLot" resultType="com.ycl.vo.cockpit.statisticsEvents.StatisticsEventsVO$LotVO">
+ SELECT vp.`name` ,COUNT(v.id) count
+ from ums_violations v
+ INNER JOIN ums_data_dictionary dd on v.grade_id = dd.id
+ INNER JOIN ums_base_case b on b.id = v.id
+ INNER JOIN ums_video_point vp on v.video_point_id = vp.id
+ WHERE v.video_alarm_report_id is not NULL
+ <if test="beginTime !='' and endTime !='' and beginTime!=null and endTime !=null">
+ and create_time between #{beginTime} and #{endTime}
+ </if>
+ <if test="streetId !=null ">
+ and b.street_id = #{streetId}
+ </if>
+ GROUP BY v.video_point_id
</select>
</mapper>
--
Gitblit v1.8.0