新增政策指南

ruoyi-admin/pom.xml

@@ -9,7 +9,7 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>jar</packaging>
-    <artifactId>ruoyi-admin</artifactId>
+    <artifactId>xinyong</artifactId>
 
     <description>
         web服务入口

ruoyi-admin/src/main/java/com/ruoyi/web/controller/business/PolicyGuideController.java

@@ -0,0 +1,104 @@
+package com.ruoyi.web.controller.business;
+
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.system.domain.PolicyGuide;
+import com.ruoyi.system.service.IPolicyGuideService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 政策指南Controller
+ * 
+ * @author boman
+ * @date 2022-06-16
+ */
+@RestController
+@RequestMapping("/system/guide")
+public class PolicyGuideController extends BaseController
+{
+    @Autowired
+    private IPolicyGuideService policyGuideService;
+
+    /**
+     * 查询政策指南列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:guide:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(PolicyGuide policyGuide)
+    {
+        startPage();
+        List<PolicyGuide> list = policyGuideService.selectPolicyGuideList(policyGuide);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出政策指南列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:guide:export')")
+    @Log(title = "政策指南", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, PolicyGuide policyGuide)
+    {
+        List<PolicyGuide> list = policyGuideService.selectPolicyGuideList(policyGuide);
+        ExcelUtil<PolicyGuide> util = new ExcelUtil<PolicyGuide>(PolicyGuide.class);
+        util.exportExcel(response, list, "政策指南数据");
+    }
+
+    /**
+     * 获取政策指南详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('system:guide:query')")
+    @GetMapping(value = "/{policyId}")
+    public AjaxResult getInfo(@PathVariable("policyId") Long policyId)
+    {
+        return AjaxResult.success(policyGuideService.selectPolicyGuideByPolicyId(policyId));
+    }
+
+    /**
+     * 新增政策指南
+     */
+    @PreAuthorize("@ss.hasPermi('system:guide:add')")
+    @Log(title = "政策指南", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody PolicyGuide policyGuide)
+    {
+        return toAjax(policyGuideService.insertPolicyGuide(policyGuide));
+    }
+
+    /**
+     * 修改政策指南
+     */
+    @PreAuthorize("@ss.hasPermi('system:guide:edit')")
+    @Log(title = "政策指南", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody PolicyGuide policyGuide)
+    {
+        return toAjax(policyGuideService.updatePolicyGuide(policyGuide));
+    }
+
+    /**
+     * 删除政策指南
+     */
+    @PreAuthorize("@ss.hasPermi('system:guide:remove')")
+    @Log(title = "政策指南", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{policyIds}")
+    public AjaxResult remove(@PathVariable Long[] policyIds)
+    {
+        return toAjax(policyGuideService.deletePolicyGuideByPolicyIds(policyIds));
+    }
+}

ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java

@@ -81,7 +81,7 @@ public class CommonController
             String filePath = RuoYiConfig.getUploadPath();
             // 上传并返回新文件名称
             String fileName = FileUploadUtils.upload(filePath, file);
-            String url = serverConfig.getUrl() + fileName;
+            String url = RuoYiConfig.getPathMappingUp()+ fileName;
             AjaxResult ajax = AjaxResult.success();
             ajax.put("url", url);
             ajax.put("fileName", fileName);

ruoyi-admin/src/main/java/com/ruoyi/web/controller/h5/H5Controller.java

@@ -5,11 +5,9 @@ import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.system.domain.CreditUser;
 import com.ruoyi.common.core.domain.entity.PolicyMenu;
+import com.ruoyi.system.domain.PolicyGuide;
 import com.ruoyi.system.domain.UsageRecord;
-import com.ruoyi.system.service.ICreditUserService;
-import com.ruoyi.system.service.IPolicyMenuService;
-import com.ruoyi.system.service.ISettledMerchantsService;
-import com.ruoyi.system.service.IUsageRecordService;
+import com.ruoyi.system.service.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
@@ -37,6 +35,9 @@ public class H5Controller extends BaseController
     @Autowired
     private IUsageRecordService usageRecordService;
 
+    @Autowired
+    private IPolicyGuideService policyGuideService;
+
     /**
      * 根据政策类别获取入驻商家详细信息
      */
@@ -74,4 +75,24 @@ public class H5Controller extends BaseController
     {
         return usageRecordService.selectUsageRecordListByRecordId(creditId);
     }
+
+    /**
+     * 查询政策指南列表
+     */
+    @GetMapping("/guideList")
+    public TableDataInfo guideList(PolicyGuide policyGuide)
+    {
+        startPage();
+        List<PolicyGuide> list = policyGuideService.selectPolicyGuideList(policyGuide);
+        return getDataTable(list);
+    }
+
+    /**
+     * 获取政策指南详细信息
+     */
+    @GetMapping(value = "/guide/{policyId}")
+    public AjaxResult getInfo(@PathVariable("policyId") Long policyId)
+    {
+        return AjaxResult.success(policyGuideService.selectPolicyGuideByPolicyId(policyId));
+    }
 }

ruoyi-admin/src/main/resources/application-druid.yml

@@ -10,6 +10,8 @@ ruoyi:
     demoEnabled: true
     # 文件路径 示例（ Windows配置D:/ruoyi/uploadPath，Linux配置 /home/ruoyi/uploadPath）
     profile: D:/ruoyi/uploadPath
+    #文件上传的激活前缀
+    pathMapping: http://192.168.10.11:9000
     # 获取ip地址开关
     addressEnabled: false
     # 验证码类型 math 数组计算 char 字符验证

ruoyi-admin/src/main/resources/application-prod.yml

@@ -9,11 +9,14 @@ ruoyi:
     # 实例演示开关
     demoEnabled: true
     # 文件路径 示例（ Windows配置D:/ruoyi/uploadPath，Linux配置 /home/ruoyi/uploadPath）
-    profile: /home/ruoyi/uploadPath
+    profile: /home/boman/xinyong
+    #文件上传的激活前缀
+    pathMapping: http://118.31.23.65:5007/prod-api
     # 获取ip地址开关
     addressEnabled: false
     # 验证码类型 math 数组计算 char 字符验证
     captchaType: math
+
 # 数据源配置
 spring:
     datasource:

ruoyi-admin/src/main/resources/application.yml

@@ -80,6 +80,6 @@ xss:
   # 过滤开关
   enabled: true
   # 排除链接（多个用逗号分隔）
-  excludes: /system/notice,/system/merchants
+  excludes: /system/notice,/system/merchants,/system/guide
   # 匹配链接
   urlPatterns: /system/*,/monitor/*,/tool/*

ruoyi-common/src/main/java/com/ruoyi/common/config/RuoYiConfig.java

@@ -26,6 +26,10 @@ public class RuoYiConfig
 
     /** 上传路径 */
     private static String profile;
+    /**
+     * 文件前缀
+     */
+    private static String pathMapping;
 
     /** 获取地址开关 */
     private static boolean addressEnabled;
@@ -33,6 +37,14 @@ public class RuoYiConfig
     /** 验证码类型 */
     private static String captchaType;
 
+    public static String getPathMapping() {
+        return pathMapping;
+    }
+
+    public  void setPathMapping(String pathMapping) {
+        RuoYiConfig.pathMapping = pathMapping;
+    }
+
     public String getName()
     {
         return name;
@@ -132,4 +144,12 @@ public class RuoYiConfig
     {
         return getProfile() + "/upload";
     }
+
+    /**
+     * 获取上传路径
+     */
+    public static String getPathMappingUp()
+    {
+        return getPathMapping();
+    }
 }

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

@@ -0,0 +1,84 @@
+package com.ruoyi.system.domain;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 政策指南对象 policy_guide
+ * 
+ * @author boman
+ * @date 2022-06-16
+ */
+public class PolicyGuide extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 政策ID */
+    private Long policyId;
+
+    /** 政策标题 */
+    @Excel(name = "政策标题")
+    private String policyTitle;
+
+    /** 政策内容 */
+    @Excel(name = "政策内容")
+    private String policyContent;
+
+    /** 政策状态（0正常 1关闭） */
+    @Excel(name = "政策状态", readConverterExp = "0=正常,1=关闭")
+    private String status;
+
+    public void setPolicyId(Long policyId) 
+    {
+        this.policyId = policyId;
+    }
+
+    public Long getPolicyId() 
+    {
+        return policyId;
+    }
+    public void setPolicyTitle(String policyTitle) 
+    {
+        this.policyTitle = policyTitle;
+    }
+
+    public String getPolicyTitle() 
+    {
+        return policyTitle;
+    }
+    public void setPolicyContent(String policyContent) 
+    {
+        this.policyContent = policyContent;
+    }
+
+    public String getPolicyContent() 
+    {
+        return policyContent;
+    }
+    public void setStatus(String status) 
+    {
+        this.status = status;
+    }
+
+    public String getStatus() 
+    {
+        return status;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("policyId", getPolicyId())
+            .append("policyTitle", getPolicyTitle())
+            .append("policyContent", getPolicyContent())
+            .append("status", getStatus())
+            .append("createBy", getCreateBy())
+            .append("createTime", getCreateTime())
+            .append("updateBy", getUpdateBy())
+            .append("updateTime", getUpdateTime())
+            .append("remark", getRemark())
+            .toString();
+    }
+}

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

@@ -0,0 +1,61 @@
+package com.ruoyi.system.mapper;
+
+import java.util.List;
+import com.ruoyi.system.domain.PolicyGuide;
+
+/**
+ * 政策指南Mapper接口
+ * 
+ * @author boman
+ * @date 2022-06-16
+ */
+public interface PolicyGuideMapper 
+{
+    /**
+     * 查询政策指南
+     * 
+     * @param policyId 政策指南主键
+     * @return 政策指南
+     */
+    public PolicyGuide selectPolicyGuideByPolicyId(Long policyId);
+
+    /**
+     * 查询政策指南列表
+     * 
+     * @param policyGuide 政策指南
+     * @return 政策指南集合
+     */
+    public List<PolicyGuide> selectPolicyGuideList(PolicyGuide policyGuide);
+
+    /**
+     * 新增政策指南
+     * 
+     * @param policyGuide 政策指南
+     * @return 结果
+     */
+    public int insertPolicyGuide(PolicyGuide policyGuide);
+
+    /**
+     * 修改政策指南
+     * 
+     * @param policyGuide 政策指南
+     * @return 结果
+     */
+    public int updatePolicyGuide(PolicyGuide policyGuide);
+
+    /**
+     * 删除政策指南
+     * 
+     * @param policyId 政策指南主键
+     * @return 结果
+     */
+    public int deletePolicyGuideByPolicyId(Long policyId);
+
+    /**
+     * 批量删除政策指南
+     * 
+     * @param policyIds 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deletePolicyGuideByPolicyIds(Long[] policyIds);
+}

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

@@ -0,0 +1,61 @@
+package com.ruoyi.system.service;
+
+import java.util.List;
+import com.ruoyi.system.domain.PolicyGuide;
+
+/**
+ * 政策指南Service接口
+ * 
+ * @author boman
+ * @date 2022-06-16
+ */
+public interface IPolicyGuideService 
+{
+    /**
+     * 查询政策指南
+     * 
+     * @param policyId 政策指南主键
+     * @return 政策指南
+     */
+    public PolicyGuide selectPolicyGuideByPolicyId(Long policyId);
+
+    /**
+     * 查询政策指南列表
+     * 
+     * @param policyGuide 政策指南
+     * @return 政策指南集合
+     */
+    public List<PolicyGuide> selectPolicyGuideList(PolicyGuide policyGuide);
+
+    /**
+     * 新增政策指南
+     * 
+     * @param policyGuide 政策指南
+     * @return 结果
+     */
+    public int insertPolicyGuide(PolicyGuide policyGuide);
+
+    /**
+     * 修改政策指南
+     * 
+     * @param policyGuide 政策指南
+     * @return 结果
+     */
+    public int updatePolicyGuide(PolicyGuide policyGuide);
+
+    /**
+     * 批量删除政策指南
+     * 
+     * @param policyIds 需要删除的政策指南主键集合
+     * @return 结果
+     */
+    public int deletePolicyGuideByPolicyIds(Long[] policyIds);
+
+    /**
+     * 删除政策指南信息
+     * 
+     * @param policyId 政策指南主键
+     * @return 结果
+     */
+    public int deletePolicyGuideByPolicyId(Long policyId);
+}

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

@@ -0,0 +1,96 @@
+package com.ruoyi.system.service.impl;
+
+import java.util.List;
+import com.ruoyi.common.utils.DateUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.system.mapper.PolicyGuideMapper;
+import com.ruoyi.system.domain.PolicyGuide;
+import com.ruoyi.system.service.IPolicyGuideService;
+
+/**
+ * 政策指南Service业务层处理
+ * 
+ * @author boman
+ * @date 2022-06-16
+ */
+@Service
+public class PolicyGuideServiceImpl implements IPolicyGuideService 
+{
+    @Autowired
+    private PolicyGuideMapper policyGuideMapper;
+
+    /**
+     * 查询政策指南
+     * 
+     * @param policyId 政策指南主键
+     * @return 政策指南
+     */
+    @Override
+    public PolicyGuide selectPolicyGuideByPolicyId(Long policyId)
+    {
+        return policyGuideMapper.selectPolicyGuideByPolicyId(policyId);
+    }
+
+    /**
+     * 查询政策指南列表
+     * 
+     * @param policyGuide 政策指南
+     * @return 政策指南
+     */
+    @Override
+    public List<PolicyGuide> selectPolicyGuideList(PolicyGuide policyGuide)
+    {
+        return policyGuideMapper.selectPolicyGuideList(policyGuide);
+    }
+
+    /**
+     * 新增政策指南
+     * 
+     * @param policyGuide 政策指南
+     * @return 结果
+     */
+    @Override
+    public int insertPolicyGuide(PolicyGuide policyGuide)
+    {
+        policyGuide.setCreateTime(DateUtils.getNowDate());
+        return policyGuideMapper.insertPolicyGuide(policyGuide);
+    }
+
+    /**
+     * 修改政策指南
+     * 
+     * @param policyGuide 政策指南
+     * @return 结果
+     */
+    @Override
+    public int updatePolicyGuide(PolicyGuide policyGuide)
+    {
+        policyGuide.setUpdateTime(DateUtils.getNowDate());
+        return policyGuideMapper.updatePolicyGuide(policyGuide);
+    }
+
+    /**
+     * 批量删除政策指南
+     * 
+     * @param policyIds 需要删除的政策指南主键
+     * @return 结果
+     */
+    @Override
+    public int deletePolicyGuideByPolicyIds(Long[] policyIds)
+    {
+        return policyGuideMapper.deletePolicyGuideByPolicyIds(policyIds);
+    }
+
+    /**
+     * 删除政策指南信息
+     * 
+     * @param policyId 政策指南主键
+     * @return 结果
+     */
+    @Override
+    public int deletePolicyGuideByPolicyId(Long policyId)
+    {
+        return policyGuideMapper.deletePolicyGuideByPolicyId(policyId);
+    }
+}

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

@@ -193,7 +193,7 @@ public class PolicyMenuServiceImpl implements IPolicyMenuService {
     public String checkMenuNameUnique(PolicyMenu policyMenu) {
         Long menuId = StringUtils.isNull(policyMenu.getMenuId()) ? -1L : policyMenu.getMenuId();
         PolicyMenu info = policyMenuMapper.checkMenuNameUnique(policyMenu.getMenuName(), policyMenu.getParentId());
-        if (StringUtils.isNotNull(info) && info.getMenuId().longValue() != menuId.longValue()) {
+        if (StringUtils.isNotNull(info) && info.getMenuId() != null && info.getMenuId().longValue() != menuId.longValue()) {
             return UserConstants.NOT_UNIQUE;
         }
         return UserConstants.UNIQUE;

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

@@ -0,0 +1,85 @@
+<?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.PolicyGuideMapper">
+    
+    <resultMap type="com.ruoyi.system.domain.PolicyGuide" id="PolicyGuideResult">
+        <result property="policyId"    column="policy_id"    />
+        <result property="policyTitle"    column="policy_title"    />
+        <result property="policyContent"    column="policy_content"    />
+        <result property="status"    column="status"    />
+        <result property="createBy"    column="create_by"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateBy"    column="update_by"    />
+        <result property="updateTime"    column="update_time"    />
+        <result property="remark"    column="remark"    />
+    </resultMap>
+
+    <sql id="selectPolicyGuideVo">
+        select policy_id, policy_title, policy_content, status, create_by, create_time, update_by, update_time, remark from policy_guide
+    </sql>
+
+    <select id="selectPolicyGuideList" parameterType="PolicyGuide" resultMap="PolicyGuideResult">
+        <include refid="selectPolicyGuideVo"/>
+        <where>  
+            <if test="policyTitle != null  and policyTitle != ''"> and policy_title = #{policyTitle}</if>
+        </where>
+        order by create_time DESC
+    </select>
+    
+    <select id="selectPolicyGuideByPolicyId" parameterType="Long" resultMap="PolicyGuideResult">
+        <include refid="selectPolicyGuideVo"/>
+        where policy_id = #{policyId}
+    </select>
+        
+    <insert id="insertPolicyGuide" parameterType="PolicyGuide" useGeneratedKeys="true" keyProperty="policyId">
+        insert into policy_guide
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="policyTitle != null and policyTitle != ''">policy_title,</if>
+            <if test="policyContent != null">policy_content,</if>
+            <if test="status != null">status,</if>
+            <if test="createBy != null">create_by,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="updateBy != null">update_by,</if>
+            <if test="updateTime != null">update_time,</if>
+            <if test="remark != null">remark,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="policyTitle != null and policyTitle != ''">#{policyTitle},</if>
+            <if test="policyContent != null">#{policyContent},</if>
+            <if test="status != null">#{status},</if>
+            <if test="createBy != null">#{createBy},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateBy != null">#{updateBy},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+            <if test="remark != null">#{remark},</if>
+         </trim>
+    </insert>
+
+    <update id="updatePolicyGuide" parameterType="PolicyGuide">
+        update policy_guide
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="policyTitle != null and policyTitle != ''">policy_title = #{policyTitle},</if>
+            <if test="policyContent != null">policy_content = #{policyContent},</if>
+            <if test="status != null">status = #{status},</if>
+            <if test="createBy != null">create_by = #{createBy},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="updateBy != null">update_by = #{updateBy},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="remark != null">remark = #{remark},</if>
+        </trim>
+        where policy_id = #{policyId}
+    </update>
+
+    <delete id="deletePolicyGuideByPolicyId" parameterType="Long">
+        delete from policy_guide where policy_id = #{policyId}
+    </delete>
+
+    <delete id="deletePolicyGuideByPolicyIds" parameterType="String">
+        delete from policy_guide where policy_id in 
+        <foreach item="policyId" collection="array" open="(" separator="," close=")">
+            #{policyId}
+        </foreach>
+    </delete>
+</mapper>