From 5fc3aab046809ec03d59bd494a0cc91debeec251 Mon Sep 17 00:00:00 2001
From: wl <173@qq.com>
Date: 星期二, 27 九月 2022 18:24:12 +0800
Subject: [PATCH] 违规事项设置 列表和删除 违建事项设置 列表和删除
---
ycl-platform/src/main/java/com/ycl/entity/store/StoreInfo.java | 4
ycl-platform/src/main/java/com/ycl/controller/caseHandler/IllegalBuildingController.java | 49 ++++++++-
ycl-platform/src/main/java/com/ycl/entity/store/StoreScoreRule.java | 3
ycl-platform/src/main/java/com/ycl/service/dict/IDataDictionaryService.java | 5 +
ycl-platform/src/main/java/com/ycl/service/dict/impl/DataDictionaryServiceImpl.java | 13 ++
ycl-platform/src/main/java/com/ycl/vo/ViolationSettingVO.java | 47 +++++++++
ycl-platform/src/main/java/com/ycl/controller/caseHandler/ViolationsController.java | 41 +++++++
ycl-platform/src/main/java/com/ycl/mapper/dict/DataDictionaryMapper.java | 4
ycl-platform/src/main/java/com/ycl/vo/IllegalBuildingSettingVO.java | 36 +++++++
ycl-platform/src/main/resources/mapper/dict/DataDictionaryMapper.xml | 49 +++++++++
10 files changed, 239 insertions(+), 12 deletions(-)
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 55cfe2a..3c0e5c5 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
@@ -1,10 +1,18 @@
package com.ycl.controller.caseHandler;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ycl.api.CommonResult;
import com.ycl.controller.BaseController;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
+import com.ycl.entity.dict.DataDictionary;
+import com.ycl.service.caseHandler.IIllegalBuildingService;
+import com.ycl.service.dict.IDataDictionaryService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
/**
@@ -16,7 +24,38 @@
* @since 2022-09-24
*/
@RestController
-@RequestMapping("/illegal-building")
+@RequestMapping("/illegal_building")
+@Api(tags = "杩濆缓浜嬩欢绫诲瀷璁剧疆")
public class IllegalBuildingController extends BaseController {
-}
+ @Autowired
+ IDataDictionaryService iDataDictionaryService;
+
+ /**
+ * @Description 鏌ヨ杩濆缓绫诲瀷
+ * @Param [size, current, keyWord]
+ * @return com.ycl.api.CommonResult
+ **/
+ @ApiOperation(value = "鏌ヨ杩濆缓绫诲瀷")
+ @GetMapping("/query")
+ 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));
+ }
+
+ /**
+ * @Description delete illegal building by id
+ * @Param [id]
+ * @return com.ycl.api.CommonResult
+ **/
+ @ApiOperation(value = "鍒犻櫎杩濆缓绫诲瀷")
+ @DeleteMapping("/delete")
+ public CommonResult removeIllegalBuilding(@RequestParam Integer id){
+ return CommonResult.success(iDataDictionaryService.removeById(id));
+ }
+
+}
\ No newline at end of file
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 c4a975b..81f1d9f 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
@@ -1,10 +1,15 @@
package com.ycl.controller.caseHandler;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ycl.api.CommonResult;
import com.ycl.controller.BaseController;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
+import com.ycl.entity.dict.DataDictionary;
+import com.ycl.service.dict.IDataDictionaryService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
/**
@@ -17,6 +22,36 @@
*/
@RestController
@RequestMapping("/violations")
+@Api(tags = "杩濊浜嬮」璁剧疆")
public class ViolationsController extends BaseController {
+ @Autowired
+ IDataDictionaryService iDataDictionaryService;
+
+ /**
+ * @Description 鏌ヨ杩濆缓绫诲瀷
+ * @Param [size, current, keyWord]
+ * @return com.ycl.api.CommonResult
+ **/
+ @ApiOperation(value = "鏌ヨ杩濊绫诲瀷")
+ @GetMapping("/query")
+ 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.listViolations(dataDictionaryPage,keyWord));
+ }
+
+ /**
+ * @Description delete illegal building by id
+ * @Param [id]
+ * @return com.ycl.api.CommonResult
+ **/
+ @ApiOperation(value = "鍒犻櫎杩濊绫诲瀷")
+ @DeleteMapping("/delete")
+ public CommonResult removeIllegalBuilding(@RequestParam Integer id){
+ return CommonResult.success(iDataDictionaryService.removeById(id));
+ }
}
diff --git a/ycl-platform/src/main/java/com/ycl/entity/store/StoreInfo.java b/ycl-platform/src/main/java/com/ycl/entity/store/StoreInfo.java
index 89cb0e4..360c80a 100644
--- a/ycl-platform/src/main/java/com/ycl/entity/store/StoreInfo.java
+++ b/ycl-platform/src/main/java/com/ycl/entity/store/StoreInfo.java
@@ -8,7 +8,7 @@
import io.swagger.annotations.ApiModelProperty;
import lombok.*;
-import java.io.Serial;
+
import java.io.Serializable;
import java.math.BigDecimal;
@@ -29,7 +29,7 @@
@Builder
public class StoreInfo implements Serializable {
- @Serial
+
private static final long serialVersionUID = 1L;
@ApiModelProperty("涓婚敭")
diff --git a/ycl-platform/src/main/java/com/ycl/entity/store/StoreScoreRule.java b/ycl-platform/src/main/java/com/ycl/entity/store/StoreScoreRule.java
index 2517486..a42497d 100644
--- a/ycl-platform/src/main/java/com/ycl/entity/store/StoreScoreRule.java
+++ b/ycl-platform/src/main/java/com/ycl/entity/store/StoreScoreRule.java
@@ -7,7 +7,6 @@
import io.swagger.annotations.ApiModelProperty;
import lombok.*;
-import java.io.Serial;
import java.io.Serializable;
import java.math.BigDecimal;
@@ -28,7 +27,7 @@
@Builder
public class StoreScoreRule implements Serializable {
- @Serial
+
private static final long serialVersionUID = 1L;
@ApiModelProperty("涓婚敭")
diff --git a/ycl-platform/src/main/java/com/ycl/mapper/dict/DataDictionaryMapper.java b/ycl-platform/src/main/java/com/ycl/mapper/dict/DataDictionaryMapper.java
index d3a5bdd..dc16764 100644
--- a/ycl-platform/src/main/java/com/ycl/mapper/dict/DataDictionaryMapper.java
+++ b/ycl-platform/src/main/java/com/ycl/mapper/dict/DataDictionaryMapper.java
@@ -1,6 +1,7 @@
package com.ycl.mapper.dict;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ycl.entity.dict.DataDictionary;
/**
@@ -13,4 +14,7 @@
*/
public interface DataDictionaryMapper extends BaseMapper<DataDictionary> {
+ Page<DataDictionary> listDataDictionaryPage(Page<DataDictionary> dataDictionaryPage, String keyWord);
+
+ Page<DataDictionary> listViolationPage(Page<DataDictionary> dataDictionaryPage, String keyWord);
}
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 0066cb1..78fb676 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
@@ -1,5 +1,6 @@
package com.ycl.service.dict;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ycl.entity.dict.DataDictionary;
@@ -26,4 +27,8 @@
* @return
*/
DataDictionary queryByCode(String code);
+
+ Page listIllegalBuildingSettings(Page<DataDictionary> dataDictionaryPage, String keyWork);
+
+ Page listViolations(Page<DataDictionary> dataDictionaryPage, String keyWord);
}
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 16a4554..0586ddf 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
@@ -3,6 +3,7 @@
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ycl.entity.dict.DataDictionary;
import com.ycl.mapper.dict.DataDictionaryMapper;
@@ -52,4 +53,16 @@
DataDictionary dataDictionary = dataDictionaryMapper.selectOne(queryWrapper);
return dataDictionary;
}
+
+ @Override
+ public Page listIllegalBuildingSettings(Page<DataDictionary> dataDictionaryPage, String keyWord) {
+ Page<DataDictionary> dataDictionaryPageList = dataDictionaryMapper.listDataDictionaryPage(dataDictionaryPage,keyWord);
+ return dataDictionaryPageList;
+ }
+
+ @Override
+ public Page listViolations(Page<DataDictionary> dataDictionaryPage, String keyWord) {
+ Page<DataDictionary> dataDictionaryPageList = dataDictionaryMapper.listViolationPage(dataDictionaryPage,keyWord);
+ return dataDictionaryPageList;
+ }
}
diff --git a/ycl-platform/src/main/java/com/ycl/vo/IllegalBuildingSettingVO.java b/ycl-platform/src/main/java/com/ycl/vo/IllegalBuildingSettingVO.java
new file mode 100644
index 0000000..6de1029
--- /dev/null
+++ b/ycl-platform/src/main/java/com/ycl/vo/IllegalBuildingSettingVO.java
@@ -0,0 +1,36 @@
+package com.ycl.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * <p>
+ *
+ * </p>
+ *
+ * @author wl
+ * @since 2022-09-27
+ */
+@Data
+@ApiModel("杩濆缓浜嬮」璁剧疆")
+public class IllegalBuildingSettingVO {
+ /**
+ * 杩濊浜嬮」缂栧彿
+ */
+ @ApiModelProperty(value ="杩濆缓浜嬮」缂栧彿" )
+ private Integer number;
+
+ /**
+ * 鎵�灞炵被鍨�
+ */
+ @ApiModelProperty(value = "鎵�灞炵被鍨�",dataType = "String")
+ private String type;
+
+ /**
+ * 鎵�灞炵被鍒�
+ */
+ @ApiModelProperty(value = "鎵�灞炵被鍒�",dataType = "String")
+ private String typeFirst;
+
+}
\ No newline at end of file
diff --git a/ycl-platform/src/main/java/com/ycl/vo/ViolationSettingVO.java b/ycl-platform/src/main/java/com/ycl/vo/ViolationSettingVO.java
new file mode 100644
index 0000000..5d966a4
--- /dev/null
+++ b/ycl-platform/src/main/java/com/ycl/vo/ViolationSettingVO.java
@@ -0,0 +1,47 @@
+package com.ycl.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * <p>
+ *
+ * </p>
+ *
+ * @author wl
+ * @since 2022-09-27
+ */
+@Data
+@ApiModel("杩濊浜嬮」璁剧疆")
+public class ViolationSettingVO {
+ /**
+ * 杩濊浜嬮」缂栧彿
+ */
+ @ApiModelProperty(value ="杩濊浜嬮」缂栧彿" )
+ private Integer number;
+
+ /**
+ * 鎵�灞炵被鍨�
+ */
+ @ApiModelProperty(value = "鎵�灞炵被鍨�",dataType = "String")
+ private String type;
+
+ /**
+ * 鎵�灞炲ぇ绫�
+ */
+ @ApiModelProperty(value = "鎵�灞炲ぇ绫�",dataType = "String")
+ private String typeFirst;
+
+ /**
+ * 鎵�灞炲皬绫�
+ */
+ @ApiModelProperty(value = "鎵�灞炲皬绫�",dataType = "String")
+ private String typeSecond;
+
+ /**
+ * 妗堢敱
+ */
+ @ApiModelProperty(value = "妗堢敱",dataType = "String")
+ private String typeThird;
+}
\ No newline at end of file
diff --git a/ycl-platform/src/main/resources/mapper/dict/DataDictionaryMapper.xml b/ycl-platform/src/main/resources/mapper/dict/DataDictionaryMapper.xml
index 355abb6..d21673b 100644
--- a/ycl-platform/src/main/resources/mapper/dict/DataDictionaryMapper.xml
+++ b/ycl-platform/src/main/resources/mapper/dict/DataDictionaryMapper.xml
@@ -19,4 +19,53 @@
id, name, code, type_name,type_code,parent_id,level,remark
</sql>
+ <resultMap id="settingsResultMap" type="com.ycl.vo.IllegalBuildingSettingVO">
+ <id column="number" property="number" />
+ <result column="type" property="type" />
+ <result column="typeFirst" property="typeFirst" />
+ <result column="typeSecond" property="typeSecond" />
+ <result column="typeThird" property="typeThird" />
+ </resultMap>
+
+
+ <select id="listDataDictionaryPage" resultType="com.ycl.vo.IllegalBuildingSettingVO">
+ SELECT
+ d1.id AS number,
+ d1.`name` AS type,
+ d2.`name` AS typeFirst
+ FROM
+ `ums_data_dictionary` AS d1
+ JOIN ums_data_dictionary AS d2 ON d1.parent_id = d2.id
+ <where>
+ d1.`level` = '2'
+ AND d1.type_code = '06'
+ <if test="keyWord !=null and keyWord !=''">
+ AND d1.`name` LIKE '%${keyWord}%'
+ </if>
+
+ </where>
+ </select>
+
+ <select id="listViolationPage" resultType="com.ycl.vo.ViolationSettingVO">
+ SELECT
+ d1.id AS number,
+ d1.`name` AS type,
+ d2.`name` AS typeFirst,
+ d3.`name` AS typeSecond,
+ d4.`name` AS typeThird
+ FROM
+ `ums_data_dictionary` AS d1
+ JOIN ums_data_dictionary AS d2 ON d1.parent_id = d2.id
+ JOIN ums_data_dictionary AS d3 ON d2.parent_id = d3.id
+ JOIN ums_data_dictionary AS d4 ON d3.parent_id = d4.id
+ <where>
+ d1.`level` = '4'
+ AND d1.type_code = '01'
+ <if test="keyWord !=null and keyWord !=''">
+ AND d1.`name` LIKE '%${keyWord}%'
+ </if>
+
+ </where>
+ </select>
+
</mapper>
--
Gitblit v1.8.0