From 41bf6384e3928f1490bf28b03b11ff6199d238df Mon Sep 17 00:00:00 2001
From: liyanqi <15181887205@163.com>
Date: 星期四, 15 九月 2022 18:48:03 +0800
Subject: [PATCH] 字典模块
---
ycl-common/src/main/resources/mapper/platform/dict/DatabaseDictionaryMapper.xml | 18 +++
ycl-common/src/main/java/com/ycl/mapper/platform/dict/DatabaseDictionaryMapper.java | 16 +++
ycl-common/src/main/java/com/ycl/service/platform/dict/IDatabaseDictionaryService.java | 29 +++++
ycl-common/src/main/resources/mapper/platform/zfreport/EnforcelawReportMapper.xml | 15 +-
ycl-platform/src/main/java/com/ycl/controller/dict/DatabaseDictionaryController.java | 45 +++++++++
ycl-common/src/main/java/com/ycl/service/platform/zfreport/IEnforcelawReportService.java | 2
ycl-common/src/main/java/com/ycl/utils/redis/RedisKey.java | 5 +
ycl-common/src/main/java/com/ycl/entity/platform/zfreport/EnforcelawReport.java | 48 ++++-----
ycl-platform/src/main/resources/application.yml | 1
ycl-common/src/main/java/com/ycl/entity/platform/dict/DatabaseDictionary.java | 52 ++++++++++
ycl-common/src/main/java/com/ycl/service/platform/dict/impl/DatabaseDictionaryServiceImpl.java | 60 ++++++++++++
11 files changed, 258 insertions(+), 33 deletions(-)
diff --git a/ycl-common/src/main/java/com/ycl/entity/platform/dict/DatabaseDictionary.java b/ycl-common/src/main/java/com/ycl/entity/platform/dict/DatabaseDictionary.java
new file mode 100644
index 0000000..5babd87
--- /dev/null
+++ b/ycl-common/src/main/java/com/ycl/entity/platform/dict/DatabaseDictionary.java
@@ -0,0 +1,52 @@
+package com.ycl.entity.platform.dict;
+
+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 lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ *
+ * </p>
+ *
+ * @author lyq
+ * @since 2022-09-15
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@TableName("ums_database_dictionary")
+public class DatabaseDictionary implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 涓婚敭
+ */
+ @TableId(value = "id", type = IdType.AUTO)
+ private Long id;
+
+ /**
+ * 瀛楀吀鍊�
+ */
+ @TableField("dictName")
+ private String dictName;
+
+ /**
+ * 瀛楀吀绫诲瀷
+ */
+ @TableField("typeName")
+ private String typeName;
+
+ /**
+ * 瀛楀吀绫诲瀷浠ｇ爜
+ */
+ @TableField("typeCode")
+ private String typeCode;
+
+
+}
diff --git a/ycl-common/src/main/java/com/ycl/entity/platform/zfreport/EnforcelawReport.java b/ycl-common/src/main/java/com/ycl/entity/platform/zfreport/EnforcelawReport.java
index 40fb338..dfd3e64 100644
--- a/ycl-common/src/main/java/com/ycl/entity/platform/zfreport/EnforcelawReport.java
+++ b/ycl-common/src/main/java/com/ycl/entity/platform/zfreport/EnforcelawReport.java
@@ -9,7 +9,7 @@
import java.io.Serializable;
import java.math.BigDecimal;
-import java.util.Date;
+import java.time.LocalDateTime;
/**
* <p>
@@ -17,7 +17,7 @@
* </p>
*
* @author lyq
- * @since 2022-09-14
+ * @since 2022-09-15
*/
@Data
@EqualsAndHashCode(callSuper = false)
@@ -35,8 +35,8 @@
/**
* 杩濇硶/杩濆缓淇℃伅鏉ユ簮锛屽瓧鍏搁」
*/
- @TableField("inforesoure")
- private String inforesoure;
+ @TableField("infoResoure")
+ private String infoResoure;
/**
* 鍙楃悊浜�
@@ -47,8 +47,8 @@
/**
* 闂绫诲瀷
*/
- @TableField("problemtypes")
- private String problemtypes;
+ @TableField("problemTypes")
+ private String problemTypes;
/**
* 杩濆缓/杩濊绫诲埆
@@ -71,8 +71,8 @@
/**
* 浜嬪彂鍦板潃
*/
- @TableField("afaddr")
- private String afaddr;
+ @TableField("afAddr")
+ private String afAddr;
/**
* 涓炬姤浜�
@@ -95,8 +95,8 @@
/**
* 闂鎻忚堪
*/
- @TableField("problemdesc")
- private String problemdesc;
+ @TableField("problemDesc")
+ private String problemDesc;
/**
* 鎵ф硶浜�
@@ -167,8 +167,8 @@
/**
* 涓婁紶闄勪欢(杩濇硶鐓х墖)
*/
- @TableField("IllegalPhotos")
- private String IllegalPhotos;
+ @TableField("illegalPhotos")
+ private String illegalPhotos;
/**
* 鏁存敼鍚庣収鐗�
@@ -195,26 +195,22 @@
private String inspectors;
/**
- * @Description 鐘舵��
- * @Param
- * @return
- **/
+ * 鐘舵��
+ */
@TableField("status")
private String status;
/**
- * @Description 鍒涘缓鏃堕棿
- * @Param
- * @return
- **/
+ * 鍒涘缓鏃堕棿
+ */
@TableField("cTime")
- private Date cTime;
+ private LocalDateTime cTime;
/**
- * @Description 鎵�灞炶閬�
- * @Param
- * @return
- **/
+ * 鎵�灞炵ぞ鍖�
+ */
@TableField("community")
- private Date community;
+ private String community;
+
+
}
diff --git a/ycl-common/src/main/java/com/ycl/mapper/platform/dict/DatabaseDictionaryMapper.java b/ycl-common/src/main/java/com/ycl/mapper/platform/dict/DatabaseDictionaryMapper.java
new file mode 100644
index 0000000..6376e60
--- /dev/null
+++ b/ycl-common/src/main/java/com/ycl/mapper/platform/dict/DatabaseDictionaryMapper.java
@@ -0,0 +1,16 @@
+package com.ycl.mapper.platform.dict;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ycl.entity.platform.dict.DatabaseDictionary;
+
+/**
+ * <p>
+ * Mapper 鎺ュ彛
+ * </p>
+ *
+ * @author lyq
+ * @since 2022-09-15
+ */
+public interface DatabaseDictionaryMapper extends BaseMapper<DatabaseDictionary> {
+
+}
diff --git a/ycl-common/src/main/java/com/ycl/service/platform/dict/IDatabaseDictionaryService.java b/ycl-common/src/main/java/com/ycl/service/platform/dict/IDatabaseDictionaryService.java
new file mode 100644
index 0000000..cab91c8
--- /dev/null
+++ b/ycl-common/src/main/java/com/ycl/service/platform/dict/IDatabaseDictionaryService.java
@@ -0,0 +1,29 @@
+package com.ycl.service.platform.dict;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ycl.entity.platform.dict.DatabaseDictionary;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 鏈嶅姟绫�
+ * </p>
+ *
+ * @author lyq
+ * @since 2022-09-15
+ */
+public interface IDatabaseDictionaryService extends IService<DatabaseDictionary> {
+ /**
+ * 鏌ヨ鎵�鏈夊瓧鍏�
+ * @return
+ */
+ List<DatabaseDictionary> getAll();
+
+ /**
+ * 鏍规嵁code鏌ヨ鍏跺搴旂殑瀛楀吀淇℃伅
+ * @param code
+ * @return
+ */
+ DatabaseDictionary queryByCode(String code);
+}
diff --git a/ycl-common/src/main/java/com/ycl/service/platform/dict/impl/DatabaseDictionaryServiceImpl.java b/ycl-common/src/main/java/com/ycl/service/platform/dict/impl/DatabaseDictionaryServiceImpl.java
new file mode 100644
index 0000000..7970e22
--- /dev/null
+++ b/ycl-common/src/main/java/com/ycl/service/platform/dict/impl/DatabaseDictionaryServiceImpl.java
@@ -0,0 +1,60 @@
+package com.ycl.service.platform.dict.impl;
+
+import cn.hutool.core.collection.CollUtil;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.sql.StringEscape;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ycl.entity.platform.dict.DatabaseDictionary;
+import com.ycl.mapper.platform.dict.DatabaseDictionaryMapper;
+import com.ycl.service.platform.dict.IDatabaseDictionaryService;
+import com.ycl.service.redis.RedisService;
+import com.ycl.utils.common.LiveTimeMillisecond;
+import com.ycl.utils.redis.RedisKey;
+import io.micrometer.core.instrument.util.StringEscapeUtils;
+import org.apache.commons.lang3.ObjectUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * <p>
+ * 鏈嶅姟瀹炵幇绫�
+ * </p>
+ *
+ * @author lyq
+ * @since 2022-09-15
+ */
+@Service
+public class DatabaseDictionaryServiceImpl extends ServiceImpl<DatabaseDictionaryMapper, DatabaseDictionary> implements IDatabaseDictionaryService {
+
+ @Resource
+ private DatabaseDictionaryMapper databaseDictionaryMapper;
+
+ @Resource
+ private RedisService redisService;
+
+ @Override
+ public List<DatabaseDictionary> getAll() {
+ String key = RedisKey.DICT_LIST_ALL;
+ String result = (String) redisService.get(key);
+ if (StringUtils.isBlank(result)) {
+ List<DatabaseDictionary> dictList = databaseDictionaryMapper.selectList(null);
+ redisService.set(key, JSON.toJSONString(dictList), LiveTimeMillisecond.s86400.time);
+ return dictList;
+ }
+ List<DatabaseDictionary> list = JSONArray.parseArray(result, DatabaseDictionary.class);
+ return list;
+ }
+
+ @Override
+ public DatabaseDictionary queryByCode(String code) {
+ LambdaQueryWrapper<DatabaseDictionary> queryWrapper = new LambdaQueryWrapper<DatabaseDictionary>().eq(DatabaseDictionary::getTypeCode, code);
+ DatabaseDictionary databaseDictionary = databaseDictionaryMapper.selectOne(queryWrapper);
+ return databaseDictionary;
+ }
+}
diff --git a/ycl-common/src/main/java/com/ycl/service/platform/zfreport/EnforcelawReportService.java b/ycl-common/src/main/java/com/ycl/service/platform/zfreport/IEnforcelawReportService.java
similarity index 81%
rename from ycl-common/src/main/java/com/ycl/service/platform/zfreport/EnforcelawReportService.java
rename to ycl-common/src/main/java/com/ycl/service/platform/zfreport/IEnforcelawReportService.java
index bab562d..3940bcb 100644
--- a/ycl-common/src/main/java/com/ycl/service/platform/zfreport/EnforcelawReportService.java
+++ b/ycl-common/src/main/java/com/ycl/service/platform/zfreport/IEnforcelawReportService.java
@@ -11,6 +11,6 @@
* @author lyq
* @since 2022-09-14
*/
-public interface EnforcelawReportService extends IService<EnforcelawReport> {
+public interface IEnforcelawReportService extends IService<EnforcelawReport> {
}
diff --git a/ycl-common/src/main/java/com/ycl/utils/redis/RedisKey.java b/ycl-common/src/main/java/com/ycl/utils/redis/RedisKey.java
index a2665e0..0935a93 100644
--- a/ycl-common/src/main/java/com/ycl/utils/redis/RedisKey.java
+++ b/ycl-common/src/main/java/com/ycl/utils/redis/RedisKey.java
@@ -11,4 +11,9 @@
* 绠＄悊鍚庡彴
*/
public static final String PLATFORM_TOKEN_KEY = "platform-token:";
+
+ /**
+ * 瀛楀吀key
+ */
+ public static final String DICT_LIST_ALL = "dict-list-all";
}
diff --git a/ycl-common/src/main/resources/mapper/platform/dict/DatabaseDictionaryMapper.xml b/ycl-common/src/main/resources/mapper/platform/dict/DatabaseDictionaryMapper.xml
new file mode 100644
index 0000000..fade9ae
--- /dev/null
+++ b/ycl-common/src/main/resources/mapper/platform/dict/DatabaseDictionaryMapper.xml
@@ -0,0 +1,18 @@
+<?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.platform.dict.DatabaseDictionaryMapper">
+
+ <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
+ <resultMap id="BaseResultMap" type="com.ycl.entity.platform.dict.DatabaseDictionary">
+ <id column="id" property="id" />
+ <result column="dictName" property="dictName" />
+ <result column="typeName" property="typeName" />
+ <result column="typeCode" property="typeCode" />
+ </resultMap>
+
+ <!-- 閫氱敤鏌ヨ缁撴灉鍒� -->
+ <sql id="Base_Column_List">
+ id, dictName, typeName, typeCode
+ </sql>
+
+</mapper>
diff --git a/ycl-common/src/main/resources/mapper/platform/zfreport/EnforcelawReportMapper.xml b/ycl-common/src/main/resources/mapper/platform/zfreport/EnforcelawReportMapper.xml
index 64344ef..2f7a4f1 100644
--- a/ycl-common/src/main/resources/mapper/platform/zfreport/EnforcelawReportMapper.xml
+++ b/ycl-common/src/main/resources/mapper/platform/zfreport/EnforcelawReportMapper.xml
@@ -5,17 +5,17 @@
<!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
<resultMap id="BaseResultMap" type="com.ycl.entity.platform.zfreport.EnforcelawReport">
<id column="id" property="id" />
- <result column="inforesoure" property="inforesoure" />
+ <result column="infoResoure" property="infoResoure" />
<result column="acceptor" property="acceptor" />
- <result column="problemtypes" property="problemtypes" />
+ <result column="problemTypes" property="problemTypes" />
<result column="category" property="category" />
<result column="county" property="county" />
<result column="street" property="street" />
- <result column="afaddr" property="afaddr" />
+ <result column="afAddr" property="afAddr" />
<result column="informer" property="informer" />
<result column="contact" property="contact" />
<result column="reason" property="reason" />
- <result column="problemdesc" property="problemdesc" />
+ <result column="problemDesc" property="problemDesc" />
<result column="lawOfficer" property="lawOfficer" />
<result column="partiesName" property="partiesName" />
<result column="partiesID" property="partiesID" />
@@ -27,16 +27,19 @@
<result column="illegalBuildWidth" property="illegalBuildWidth" />
<result column="illegalBuildHigh" property="illegalBuildHigh" />
<result column="illegalBuildMaterials" property="illegalBuildMaterials" />
- <result column="IllegalPhotos" property="IllegalPhotos" />
+ <result column="illegalPhotos" property="illegalPhotos" />
<result column="rectifidPhotos" property="rectifidPhotos" />
<result column="accessory" property="accessory" />
<result column="disposeRemark" property="disposeRemark" />
<result column="inspectors" property="inspectors" />
+ <result column="status" property="status" />
+ <result column="cTime" property="cTime" />
+ <result column="community" property="community" />
</resultMap>
<!-- 閫氱敤鏌ヨ缁撴灉鍒� -->
<sql id="Base_Column_List">
- id, inforesoure, acceptor, problemtypes, category, county, street, afaddr, informer, contact, reason, problemdesc, lawOfficer, partiesName, partiesID, partiesPhone, idPositiveImage, idNegativeImage, illegalBuildLocation, illegalBuildLength, illegalBuildWidth, illegalBuildHigh, illegalBuildMaterials, IllegalPhotos, rectifidPhotos, accessory, disposeRemark, inspectors
+ id, infoResoure, acceptor, problemTypes, category, county, street, afAddr, informer, contact, reason, problemDesc, lawOfficer, partiesName, partiesID, partiesPhone, idPositiveImage, idNegativeImage, illegalBuildLocation, illegalBuildLength, illegalBuildWidth, illegalBuildHigh, illegalBuildMaterials, IllegalPhotos, rectifidPhotos, accessory, disposeRemark, inspectors, status, cTime, community
</sql>
</mapper>
diff --git a/ycl-platform/src/main/java/com/ycl/controller/dict/DatabaseDictionaryController.java b/ycl-platform/src/main/java/com/ycl/controller/dict/DatabaseDictionaryController.java
new file mode 100644
index 0000000..24b73c8
--- /dev/null
+++ b/ycl-platform/src/main/java/com/ycl/controller/dict/DatabaseDictionaryController.java
@@ -0,0 +1,45 @@
+package com.ycl.controller.dict;
+
+
+import com.ycl.api.CommonResult;
+import com.ycl.controller.BaseController;
+import com.ycl.entity.platform.dict.DatabaseDictionary;
+import com.ycl.service.platform.dict.IDatabaseDictionaryService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * <p>
+ * 鍓嶇鎺у埗鍣�
+ * </p>
+ *
+ * @author lyq
+ * @since 2022-09-15
+ */
+@RestController
+@RequestMapping("/dict")
+@Api(tags = "瀛楀吀妯″潡")
+public class DatabaseDictionaryController extends BaseController {
+ @Resource
+ private IDatabaseDictionaryService iDatabaseDictionaryService;
+
+ @GetMapping("/listAll")
+ @ApiOperation("鑾峰彇鎵�鏈夊瓧鍏�")
+ private CommonResult<List<DatabaseDictionary>> listAll() {
+ return CommonResult.success(iDatabaseDictionaryService.getAll());
+ }
+
+ @GetMapping("/queryByCode")
+ @ApiOperation(("/鏍规嵁code鑾峰彇瀛楁淇℃伅"))
+ private CommonResult<DatabaseDictionary> queryByCode(@RequestParam(value = "code") String code){
+ DatabaseDictionary databaseDictionary = iDatabaseDictionaryService.queryByCode(code);
+ return CommonResult.success(databaseDictionary);
+ }
+}
diff --git a/ycl-platform/src/main/resources/application.yml b/ycl-platform/src/main/resources/application.yml
index 28e200b..8b3a186 100644
--- a/ycl-platform/src/main/resources/application.yml
+++ b/ycl-platform/src/main/resources/application.yml
@@ -83,3 +83,4 @@
- /**/admin/register
- /**/admin/info
- /**/admin/logout
+ - /dict/**
--
Gitblit v1.8.0