重构代码

db/sys_city.sql

@@ -6,6 +6,7 @@ Date: 2024/06/12 16:59:21
 
 DROP TABLE IF EXISTS `sys_city`;
 CREATE TABLE `sys_city` (
+    PRIMARY KEY (`code`),
     `code` VARCHAR(255) NOT NULL COMMENT '地区代码',
     `name` VARCHAR(255) NOT NULL COMMENT '地区名称',
     `parent_code` VARCHAR(255) NOT NULL COMMENT '地区名称',

src/main/java/com/backendsys/controller/Systems/SysCityController.java

@@ -1,22 +1,22 @@
-package com.backendsys.controller.Systems;
-
-import com.backendsys.entity.System.SysCityDTO;
-import com.backendsys.service.System.SysCityService;
-import com.backendsys.utils.response.Result;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-@RestController
-public class SysCityController {
-
-    @Autowired
-    private SysCityService sysCityService;
-
-    @GetMapping("/api/public/system/getSysCity")
-    public Result getSysCity(@Validated SysCityDTO sysCityDTO) {
-        return Result.success(sysCityService.querySysCity(sysCityDTO));
-    }
-
-}
+//package com.backendsys.controller.Systems;
+//
+//import com.backendsys.entity.System.SysCityDTO;
+//import com.backendsys.service.System.SysCityService;
+//import com.backendsys.utils.response.Result;
+//import org.springframework.beans.factory.annotation.Autowired;
+//import org.springframework.validation.annotation.Validated;
+//import org.springframework.web.bind.annotation.GetMapping;
+//import org.springframework.web.bind.annotation.RestController;
+//
+//@RestController
+//public class SysCityController {
+//
+//    @Autowired
+//    private SysCityService sysCityService;
+//
+//    @GetMapping("/api/public/system/getSysCity")
+//    public Result getSysCity(@Validated SysCityDTO sysCityDTO) {
+//        return Result.success(sysCityService.querySysCity(sysCityDTO));
+//    }
+//
+//}

src/main/java/com/backendsys/entity/System/SysCityDTO.java

@@ -1,11 +1,11 @@
-package com.backendsys.entity.System;
-
-import lombok.Data;
-
-@Data
-public class SysCityDTO {
-    private String code;
-    private String name;
-    private String parent_code;
-    private String full_name;
-}
+//package com.backendsys.entity.System;
+//
+//import lombok.Data;
+//
+//@Data
+//public class SysCityDTO {
+//    private String code;
+//    private String name;
+//    private String parent_code;
+//    private String full_name;
+//}

src/main/java/com/backendsys/mapper/System/SysCityMapper.java

@@ -1,12 +1,12 @@
-package com.backendsys.mapper.System;
-
-import com.backendsys.entity.System.SysCityDTO;
-import org.apache.ibatis.annotations.Mapper;
-
-import java.util.List;
-import java.util.Map;
-
-@Mapper
-public interface SysCityMapper {
-    List<Map<String, Object>> querySysCity(SysCityDTO sysCityDTO);
-}
+//package com.backendsys.mapper.System;
+//
+//import com.backendsys.entity.System.SysCityDTO;
+//import org.apache.ibatis.annotations.Mapper;
+//
+//import java.util.List;
+//import java.util.Map;
+//
+//@Mapper
+//public interface SysCityMapper {
+//    List<Map<String, Object>> querySysCity(SysCityDTO sysCityDTO);
+//}

src/main/java/com/backendsys/mapper/System/SysCityMapper.xml

@@ -1,18 +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.backendsys.mapper.System.SysCityMapper">
+<!--<?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.backendsys.mapper.System.SysCityMapper">-->
 
-    <select id="querySysCity" resultType="java.util.LinkedHashMap">
-        SELECT code, name, parent_code, full_name
-        FROM sys_city
-        <where>
-            <if test="code != null and code != ''">
-                AND code = #{code}
-            </if>
-            <if test="parent_code != null and parent_code != ''">
-                AND parent_code = #{parent_code}
-            </if>
-        </where>
-    </select>
+<!--    <select id="querySysCity" resultType="java.util.LinkedHashMap">-->
+<!--        SELECT code, name, parent_code, full_name-->
+<!--        FROM sys_city-->
+<!--        <where>-->
+<!--            <if test="code != null and code != ''">-->
+<!--                AND code = #{code}-->
+<!--            </if>-->
+<!--            <if test="parent_code != null and parent_code != ''">-->
+<!--                AND parent_code = #{parent_code}-->
+<!--            </if>-->
+<!--        </where>-->
+<!--    </select>-->
 
-</mapper>
+<!--</mapper>-->

src/main/java/com/backendsys/modules/system/controller/SysCityController.java

@@ -0,0 +1,29 @@
+package com.backendsys.modules.system.controller;
+
+import com.backendsys.modules.common.config.security.annotations.Anonymous;
+import com.backendsys.modules.common.utils.Result;
+import com.backendsys.modules.system.entity.SysCity;
+import com.backendsys.modules.system.service.SysCityService;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@Validated
+@RestController
+@Tag(name = "省市区域枚举")
+public class SysCityController {
+
+    @Autowired
+    private SysCityService sysCityService;
+
+    @Anonymous
+    @Operation(summary = "获取省市区域信息")
+    @GetMapping("/api/system/city/getCityList")
+    public Result getSysCity(@Validated SysCity sysCity) {
+        return Result.success().put("data", sysCityService.selectCityList(sysCity));
+    }
+
+}

src/main/java/com/backendsys/modules/system/controller/SysDictionaryController.java

@@ -4,11 +4,15 @@ import com.backendsys.modules.common.config.security.annotations.Anonymous;
 import com.backendsys.modules.common.utils.Result;
 import com.backendsys.modules.system.service.SysDictionaryService;
 import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+@Validated
 @RestController
+@Tag(name = "字典枚举")
 public class SysDictionaryController {
 
     @Autowired

src/main/java/com/backendsys/modules/system/dao/SysCityDao.java

@@ -0,0 +1,14 @@
+package com.backendsys.modules.system.dao;
+
+import com.backendsys.modules.system.entity.SysCity;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+@Mapper
+public interface SysCityDao extends BaseMapper<SysCity> {
+
+    List<SysCity> selectCityList(SysCity sysCity);
+
+}

src/main/java/com/backendsys/modules/system/entity/SysCity.java

@@ -0,0 +1,15 @@
+package com.backendsys.modules.system.entity;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+@Data
+@TableName("sys_city")
+public class SysCity {
+    @TableId
+    private String code;
+    private String name;
+    private String parent_code;
+    private String full_name;
+}

src/main/java/com/backendsys/modules/system/service/SysCityService.java

@@ -0,0 +1,11 @@
+package com.backendsys.modules.system.service;
+
+import com.backendsys.modules.system.entity.SysCity;
+
+import java.util.List;
+
+public interface SysCityService {
+
+    List<SysCity> selectCityList(SysCity sysCity);
+
+}

src/main/java/com/backendsys/modules/system/service/impl/SysCityServiceImpl.java

@@ -0,0 +1,23 @@
+package com.backendsys.modules.system.service.impl;
+
+import com.backendsys.modules.system.dao.SysCityDao;
+import com.backendsys.modules.system.entity.SysCity;
+import com.backendsys.modules.system.service.SysCityService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+public class SysCityServiceImpl implements SysCityService {
+
+    @Autowired
+    private SysCityDao sysCityDao;
+
+    @Override
+    public List<SysCity> selectCityList(SysCity sysCity) {
+        List<SysCity> sysCityList = sysCityDao.selectCityList(sysCity);
+        return sysCityList;
+    }
+
+}

src/main/java/com/backendsys/service/System/SysCityService.java

@@ -1,9 +1,9 @@
-package com.backendsys.service.System;
-
-import com.backendsys.entity.System.SysCityDTO;
-
-import java.util.Map;
-
-public interface SysCityService {
-    Map<String, Object> querySysCity(SysCityDTO sysCityDTO);
-}
+//package com.backendsys.service.System;
+//
+//import com.backendsys.entity.System.SysCityDTO;
+//
+//import java.util.Map;
+//
+//public interface SysCityService {
+//    Map<String, Object> querySysCity(SysCityDTO sysCityDTO);
+//}

src/main/java/com/backendsys/service/System/SysCityServiceImpl.java

@@ -1,26 +1,26 @@
-package com.backendsys.service.System;
-
-import com.backendsys.entity.System.SysCityDTO;
-import com.backendsys.mapper.System.SysCityMapper;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-
-@Service
-public class SysCityServiceImpl implements SysCityService {
-
-    @Autowired
-    private SysCityMapper sysCityMapper;
-
-    public Map<String, Object> querySysCity(SysCityDTO sysCityDTO) {
-        List<Map<String, Object>> cityList = sysCityMapper.querySysCity(sysCityDTO);
-        Map<String, Object> resp = new LinkedHashMap<>();
-        resp.put("total", cityList.size());
-        resp.put("list", cityList);
-        return resp;
-    }
-
-}
+//package com.backendsys.service.System;
+//
+//import com.backendsys.entity.System.SysCityDTO;
+//import com.backendsys.mapper.System.SysCityMapper;
+//import org.springframework.beans.factory.annotation.Autowired;
+//import org.springframework.stereotype.Service;
+//
+//import java.util.LinkedHashMap;
+//import java.util.List;
+//import java.util.Map;
+//
+//@Service
+//public class SysCityServiceImpl implements SysCityService {
+//
+//    @Autowired
+//    private SysCityMapper sysCityMapper;
+//
+//    public Map<String, Object> querySysCity(SysCityDTO sysCityDTO) {
+//        List<Map<String, Object>> cityList = sysCityMapper.querySysCity(sysCityDTO);
+//        Map<String, Object> resp = new LinkedHashMap<>();
+//        resp.put("total", cityList.size());
+//        resp.put("list", cityList);
+//        return resp;
+//    }
+//
+//}

src/main/resources/mapper/system/SysCityDao.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.backendsys.modules.system.dao.SysCityDao">
+
+    <select id="selectCityList" resultType="com.backendsys.modules.system.entity.SysCity">
+        SELECT code, name, parent_code, full_name
+        FROM sys_city
+        <where>
+            <if test="code != null and code != ''">
+                AND code = #{code}
+            </if>
+            <if test="parent_code != null and parent_code != ''">
+                AND parent_code = #{parent_code}
+            </if>
+        </where>
+    </select>
+
+</mapper>