Merge remote-tracking branch 'origin/master'

ruoyi-admin/src/main/java/com/ruoyi/web/controller/chinaArea/ChinaAreaController.java

@@ -0,0 +1,109 @@
+package com.ruoyi.web.controller.chinaArea;
+
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.system.domain.ChinaArea;
+import com.ruoyi.system.service.IChinaAreaService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+
+/**
+ * 中国行政规划Controller
+ * 
+ * @author boman
+ * @date 2023-03-28
+ */
+@RestController
+@RequestMapping("/china/area")
+public class ChinaAreaController extends BaseController
+{
+    @Autowired
+    private IChinaAreaService chinaAreaService;
+
+    /**
+     * 查询中国行政规划列表
+     */
+    @PreAuthorize("@ss.hasPermi('china:area:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(ChinaArea chinaArea)
+    {
+        startPage();
+        List<ChinaArea> list = chinaAreaService.selectChinaAreaList(chinaArea);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出中国行政规划列表
+     */
+    @PreAuthorize("@ss.hasPermi('china:area:export')")
+    @Log(title = "中国行政规划", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, ChinaArea chinaArea)
+    {
+        List<ChinaArea> list = chinaAreaService.selectChinaAreaList(chinaArea);
+        ExcelUtil<ChinaArea> util = new ExcelUtil<ChinaArea>(ChinaArea.class);
+        util.exportExcel(response, list, "中国行政规划数据");
+    }
+
+    /**
+     * 获取中国行政规划详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('china:area:query')")
+    @GetMapping(value = "/{areaId}")
+    public AjaxResult getInfo(@PathVariable("areaId") String areaId)
+    {
+        return success(chinaAreaService.selectChinaAreaByAreaId(areaId));
+    }
+
+    /**
+     * 新增中国行政规划
+     */
+    @PreAuthorize("@ss.hasPermi('china:area:add')")
+    @Log(title = "中国行政规划", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody ChinaArea chinaArea)
+    {
+        return toAjax(chinaAreaService.insertChinaArea(chinaArea));
+    }
+
+    /**
+     * 修改中国行政规划
+     */
+    @PreAuthorize("@ss.hasPermi('china:area:edit')")
+    @Log(title = "中国行政规划", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody ChinaArea chinaArea)
+    {
+        return toAjax(chinaAreaService.updateChinaArea(chinaArea));
+    }
+
+    /**
+     * 删除中国行政规划
+     */
+    @PreAuthorize("@ss.hasPermi('china:area:remove')")
+    @Log(title = "中国行政规划", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{areaIds}")
+    public AjaxResult remove(@PathVariable String[] areaIds)
+    {
+        return toAjax(chinaAreaService.deleteChinaAreaByAreaIds(areaIds));
+    }
+
+    /**
+     *获取省市
+     *
+     * @return
+     */
+    @GetMapping("/fractionation/{pid}")
+    public AjaxResult area(@PathVariable("pid") String pid ) {
+        //所有审核需要往审核意见表插入数据
+        return chinaAreaService.area(pid);
+    }
+}

ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java

@@ -112,7 +112,7 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter
                 .authorizeRequests()
                 // 对于登录login 注册register 验证码captchaImage 允许匿名访问
                 .antMatchers("/login", "/register", "/captchaImage").permitAll()
-                .antMatchers("/new/news/**", "/wx/pay/**", "/ali/pay/**","/sf/**").permitAll()
+                .antMatchers("/new/news/**", "/wx/pay/**", "/ali/pay/**","/sf/**","/china/area/fractionation/**").permitAll()
                 // 静态资源，可匿名访问
                 .antMatchers(HttpMethod.GET, "/", "/*.html", "/**/*.html", "/**/*.css", "/**/*.js", "/profile/**").permitAll()
                 .antMatchers("/swagger-ui.html", "/swagger-resources/**", "/webjars/**", "/*/api-docs", "/druid/**").permitAll()

ruoyi-system/src/main/java/com/ruoyi/system/domain/ChinaArea.java

@@ -0,0 +1,79 @@
+package com.ruoyi.system.domain;
+
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+/**
+ * 中国行政规划对象 china_area
+ * 
+ * @author boman
+ * @date 2023-03-28
+ */
+public class ChinaArea extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 区域主键 */
+    private String areaId;
+
+    /** 区域名称 */
+    @Excel(name = "区域名称")
+    private String name;
+
+    /** 区域上级标识 */
+    @Excel(name = "区域上级标识")
+    private String pid;
+
+    /** 排序 */
+    @Excel(name = "排序")
+    private Long sort;
+
+    public void setAreaId(String areaId) 
+    {
+        this.areaId = areaId;
+    }
+
+    public String getAreaId() 
+    {
+        return areaId;
+    }
+    public void setName(String name) 
+    {
+        this.name = name;
+    }
+
+    public String getName() 
+    {
+        return name;
+    }
+    public void setPid(String pid) 
+    {
+        this.pid = pid;
+    }
+
+    public String getPid() 
+    {
+        return pid;
+    }
+    public void setSort(Long sort) 
+    {
+        this.sort = sort;
+    }
+
+    public Long getSort() 
+    {
+        return sort;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("areaId", getAreaId())
+            .append("name", getName())
+            .append("pid", getPid())
+            .append("sort", getSort())
+            .toString();
+    }
+}

ruoyi-system/src/main/java/com/ruoyi/system/mapper/ChinaAreaMapper.java

@@ -0,0 +1,64 @@
+package com.ruoyi.system.mapper;
+
+
+import com.ruoyi.system.domain.ChinaArea;
+
+import java.util.List;
+
+/**
+ * 中国行政规划Mapper接口
+ * 
+ * @author boman
+ * @date 2023-03-28
+ */
+public interface ChinaAreaMapper 
+{
+    /**
+     * 查询中国行政规划
+     * 
+     * @param areaId 中国行政规划主键
+     * @return 中国行政规划
+     */
+    public ChinaArea selectChinaAreaByAreaId(String areaId);
+    public List<ChinaArea> selectChinaAreaByPId(String areaId);
+
+    /**
+     * 查询中国行政规划列表
+     * 
+     * @param chinaArea 中国行政规划
+     * @return 中国行政规划集合
+     */
+    public List<ChinaArea> selectChinaAreaList(ChinaArea chinaArea);
+
+    /**
+     * 新增中国行政规划
+     * 
+     * @param chinaArea 中国行政规划
+     * @return 结果
+     */
+    public int insertChinaArea(ChinaArea chinaArea);
+
+    /**
+     * 修改中国行政规划
+     * 
+     * @param chinaArea 中国行政规划
+     * @return 结果
+     */
+    public int updateChinaArea(ChinaArea chinaArea);
+
+    /**
+     * 删除中国行政规划
+     * 
+     * @param areaId 中国行政规划主键
+     * @return 结果
+     */
+    public int deleteChinaAreaByAreaId(String areaId);
+
+    /**
+     * 批量删除中国行政规划
+     * 
+     * @param areaIds 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteChinaAreaByAreaIds(String[] areaIds);
+}

ruoyi-system/src/main/java/com/ruoyi/system/service/IChinaAreaService.java

@@ -0,0 +1,65 @@
+package com.ruoyi.system.service;
+
+
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.system.domain.ChinaArea;
+
+import java.util.List;
+
+/**
+ * 中国行政规划Service接口
+ *
+ * @author boman
+ * @date 2023-03-28
+ */
+public interface IChinaAreaService {
+    /**
+     * 查询中国行政规划
+     *
+     * @param areaId 中国行政规划主键
+     * @return 中国行政规划
+     */
+    public ChinaArea selectChinaAreaByAreaId(String areaId);
+
+    /**
+     * 查询中国行政规划列表
+     *
+     * @param chinaArea 中国行政规划
+     * @return 中国行政规划集合
+     */
+    public List<ChinaArea> selectChinaAreaList(ChinaArea chinaArea);
+
+    /**
+     * 新增中国行政规划
+     *
+     * @param chinaArea 中国行政规划
+     * @return 结果
+     */
+    public int insertChinaArea(ChinaArea chinaArea);
+
+    /**
+     * 修改中国行政规划
+     *
+     * @param chinaArea 中国行政规划
+     * @return 结果
+     */
+    public int updateChinaArea(ChinaArea chinaArea);
+
+    /**
+     * 批量删除中国行政规划
+     *
+     * @param areaIds 需要删除的中国行政规划主键集合
+     * @return 结果
+     */
+    public int deleteChinaAreaByAreaIds(String[] areaIds);
+
+    /**
+     * 删除中国行政规划信息
+     *
+     * @param areaId 中国行政规划主键
+     * @return 结果
+     */
+    public int deleteChinaAreaByAreaId(String areaId);
+
+    AjaxResult area(String pid);
+}

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/ChinaAreaServiceImpl.java

@@ -0,0 +1,107 @@
+package com.ruoyi.system.service.impl;
+
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.system.domain.ChinaArea;
+import com.ruoyi.system.mapper.ChinaAreaMapper;
+import com.ruoyi.system.service.IChinaAreaService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+
+/**
+ * 中国行政规划Service业务层处理
+ * 
+ * @author boman
+ * @date 2023-03-28
+ */
+@Service
+public class ChinaAreaServiceImpl implements IChinaAreaService
+{
+    @Autowired
+    private ChinaAreaMapper chinaAreaMapper;
+
+    /**
+     * 查询中国行政规划
+     * 
+     * @param areaId 中国行政规划主键
+     * @return 中国行政规划
+     */
+    @Override
+    public ChinaArea selectChinaAreaByAreaId(String areaId)
+    {
+        return chinaAreaMapper.selectChinaAreaByAreaId(areaId);
+    }
+
+    /**
+     * 查询中国行政规划列表
+     * 
+     * @param chinaArea 中国行政规划
+     * @return 中国行政规划
+     */
+    @Override
+    public List<ChinaArea> selectChinaAreaList(ChinaArea chinaArea)
+    {
+        return chinaAreaMapper.selectChinaAreaList(chinaArea);
+    }
+
+    /**
+     * 新增中国行政规划
+     * 
+     * @param chinaArea 中国行政规划
+     * @return 结果
+     */
+    @Override
+    public int insertChinaArea(ChinaArea chinaArea)
+    {
+        return chinaAreaMapper.insertChinaArea(chinaArea);
+    }
+
+    /**
+     * 修改中国行政规划
+     * 
+     * @param chinaArea 中国行政规划
+     * @return 结果
+     */
+    @Override
+    public int updateChinaArea(ChinaArea chinaArea)
+    {
+        return chinaAreaMapper.updateChinaArea(chinaArea);
+    }
+
+    /**
+     * 批量删除中国行政规划
+     * 
+     * @param areaIds 需要删除的中国行政规划主键
+     * @return 结果
+     */
+    @Override
+    public int deleteChinaAreaByAreaIds(String[] areaIds)
+    {
+        return chinaAreaMapper.deleteChinaAreaByAreaIds(areaIds);
+    }
+
+    /**
+     * 删除中国行政规划信息
+     * 
+     * @param areaId 中国行政规划主键
+     * @return 结果
+     */
+    @Override
+    public int deleteChinaAreaByAreaId(String areaId)
+    {
+        return chinaAreaMapper.deleteChinaAreaByAreaId(areaId);
+    }
+
+    /**
+     * 获取行政规划
+     * @param pid
+     * @return
+     */
+    @Override
+    public AjaxResult area(String pid) {
+        List<ChinaArea> chinaAreas = chinaAreaMapper.selectChinaAreaByPId(pid);
+        return AjaxResult.success(chinaAreas);
+    }
+}

ruoyi-system/src/main/resources/mapper/system/ChinaAreaMapper.xml

@@ -0,0 +1,72 @@
+<?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.ruoyi.system.mapper.ChinaAreaMapper">
+    
+    <resultMap type="com.ruoyi.system.domain.ChinaArea" id="ChinaAreaResult">
+        <result property="areaId"    column="area_id"    />
+        <result property="name"    column="name"    />
+        <result property="pid"    column="pid"    />
+        <result property="sort"    column="sort"    />
+    </resultMap>
+
+    <sql id="selectChinaAreaVo">
+        select area_id, name, pid, sort from china_area
+    </sql>
+
+    <select id="selectChinaAreaList" parameterType="com.ruoyi.system.domain.ChinaArea" resultMap="ChinaAreaResult">
+        <include refid="selectChinaAreaVo"/>
+        <where>  
+            <if test="name != null  and name != ''"> and name like concat('%', #{name}, '%')</if>
+            <if test="pid != null  and pid != ''"> and pid = #{pid}</if>
+            <if test="sort != null "> and sort = #{sort}</if>
+        </where>
+    </select>
+    
+    <select id="selectChinaAreaByAreaId" parameterType="String" resultMap="ChinaAreaResult">
+        <include refid="selectChinaAreaVo"/>
+        where area_id = #{areaId}
+    </select>
+    <select id="selectChinaAreaByPId" resultType="com.ruoyi.system.domain.ChinaArea" resultMap="ChinaAreaResult">
+        <include refid="selectChinaAreaVo"/>
+        where pid = #{areaId}
+    </select>
+
+    <insert id="insertChinaArea" parameterType="com.ruoyi.system.domain.ChinaArea">
+        insert into china_area
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="areaId != null">area_id,</if>
+            <if test="name != null">name,</if>
+            <if test="pid != null">pid,</if>
+            <if test="sort != null">sort,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="areaId != null">#{areaId},</if>
+            <if test="name != null">#{name},</if>
+            <if test="pid != null">#{pid},</if>
+            <if test="sort != null">#{sort},</if>
+         </trim>
+    </insert>
+
+    <update id="updateChinaArea" parameterType="com.ruoyi.system.domain.ChinaArea">
+        update china_area
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="name != null">name = #{name},</if>
+            <if test="pid != null">pid = #{pid},</if>
+            <if test="sort != null">sort = #{sort},</if>
+        </trim>
+        where area_id = #{areaId}
+    </update>
+
+    <delete id="deleteChinaAreaByAreaId" parameterType="String">
+        delete from china_area where area_id = #{areaId}
+    </delete>
+
+    <delete id="deleteChinaAreaByAreaIds" parameterType="String">
+        delete from china_area where area_id in 
+        <foreach item="areaId" collection="array" open="(" separator="," close=")">
+            #{areaId}
+        </foreach>
+    </delete>
+</mapper>