1. 联调

electripper-admin/src/main/java/com/ruoyi/web/controller/system/AsArticleClassifyController.java

@@ -10,6 +10,7 @@ import com.ruoyi.common.core.domain.entity.AsArticleClassify;
 import com.ruoyi.system.service.IAsArticleClassifyService;
 import org.apache.commons.lang3.ArrayUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
@@ -30,6 +31,7 @@ public class AsArticleClassifyController extends BaseController
     /**
      * 获取分类列表
      */
+    @PreAuthorize("@ss.hasPermi('system:articleClassify:list')")
     @GetMapping("/list")
     public AjaxResult list(AsArticleClassify asArticleClassify)
     {
@@ -40,6 +42,7 @@ public class AsArticleClassifyController extends BaseController
     /**
      * 查询分类列表（排除节点）
      */
+    @PreAuthorize("@ss.hasPermi('system:articleClassify:list')")
     @GetMapping("/list/exclude/{classifyId}")
     public AjaxResult excludeChild(@PathVariable(value = "classifyId", required = false) Long classifyId)
     {
@@ -51,6 +54,7 @@ public class AsArticleClassifyController extends BaseController
     /**
      * 根据分类编号获取详细信息
      */
+    @PreAuthorize("@ss.hasPermi('system:articleClassify:query')")
     @GetMapping(value = "/{classifyId}")
     public AjaxResult getInfo(@PathVariable Long classifyId)
     {
@@ -61,6 +65,7 @@ public class AsArticleClassifyController extends BaseController
     /**
      * 新增分类
      */
+    @PreAuthorize("@ss.hasPermi('system:articleClassify:add')")
     @Log(title = "分类管理", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@Validated @RequestBody AsArticleClassify dept)
@@ -76,6 +81,7 @@ public class AsArticleClassifyController extends BaseController
     /**
      * 修改分类
      */
+    @PreAuthorize("@ss.hasPermi('system:articleClassify:edit')")
     @Log(title = "分类管理", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@Validated @RequestBody AsArticleClassify articleClassify)
@@ -101,6 +107,7 @@ public class AsArticleClassifyController extends BaseController
     /**
      * 删除分类
      */
+    @PreAuthorize("@ss.hasPermi('system:articleClassify:remove')")
     @Log(title = "分类管理", businessType = BusinessType.DELETE)
     @DeleteMapping("/{classifyId}")
     public AjaxResult remove(@PathVariable Long classifyId)

electripper-admin/src/main/java/com/ruoyi/web/controller/system/AsArticleController.java

@@ -36,7 +36,7 @@ public class AsArticleController extends BaseController
     /**
      * 查询文章列表
      */
-//    @PreAuthorize("@ss.hasPermi('system:article:list')")
+    @PreAuthorize("@ss.hasPermi('system:article:list')")
     @GetMapping("/list")
     public TableDataInfo list(EtArticle etArticle)
     {
@@ -48,7 +48,7 @@ public class AsArticleController extends BaseController
     /**
      * 导出文章列表
      */
-//    @PreAuthorize("@ss.hasPermi('system:article:export')")
+    @PreAuthorize("@ss.hasPermi('system:article:export')")
     @Log(title = "文章", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, EtArticle etArticle)
@@ -61,7 +61,7 @@ public class AsArticleController extends BaseController
     /**
      * 获取文章详细信息
      */
-//    @PreAuthorize("@ss.hasPermi('system:article:query')")
+    @PreAuthorize("@ss.hasPermi('system:article:query')")
     @GetMapping(value = "/{articleId}")
     public AjaxResult getInfo(@PathVariable("articleId") Long articleId)
     {
@@ -71,7 +71,7 @@ public class AsArticleController extends BaseController
     /**
      * 新增文章
      */
-//    @PreAuthorize("@ss.hasPermi('system:article:add')")
+    @PreAuthorize("@ss.hasPermi('system:article:add')")
     @Log(title = "文章", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody EtArticle etArticle)
@@ -82,7 +82,7 @@ public class AsArticleController extends BaseController
     /**
      * 修改文章
      */
-//    @PreAuthorize("@ss.hasPermi('system:article:edit')")
+    @PreAuthorize("@ss.hasPermi('system:article:edit')")
     @Log(title = "文章", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody EtArticle etArticle)
@@ -93,7 +93,7 @@ public class AsArticleController extends BaseController
     /**
      * 删除文章
      */
-//    @PreAuthorize("@ss.hasPermi('system:article:remove')")
+    @PreAuthorize("@ss.hasPermi('system:article:remove')")
     @Log(title = "文章", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{articleIds}")
     public AjaxResult remove(@PathVariable Long[] articleIds)

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

@@ -9,9 +9,9 @@ spring:
 #                url: jdbc:mysql://localhost:3306/electripper?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
 #                username: root
 #                password: 123456
-                url: jdbc:mysql://106.75.233.135:3306/electripper?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+                url: jdbc:mysql://117.26.179.22:61110/electripper?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
                 username: root
-                password: 9671e015b05b3f11
+                password: d0dbe100b71c1d09
             # 从库数据源
             slave:
                 # 从数据源开关/默认关闭

electripper-common/src/main/java/com/ruoyi/common/core/domain/entity/AsArticleClassify.java

@@ -23,6 +23,9 @@ public class AsArticleClassify extends BaseEntity
     /** 父分类ID */
     private Long parentId;
 
+    /** 父分类ID */
+    private Long deptId;
+
     /** 祖级列表 */
     private String ancestors;
 
@@ -136,4 +139,11 @@ public class AsArticleClassify extends BaseEntity
         this.children = children;
     }
 
+    public Long getDeptId() {
+        return deptId;
+    }
+
+    public void setDeptId(Long deptId) {
+        this.deptId = deptId;
+    }
 }

electripper-framework/src/main/java/com/ruoyi/framework/aspectj/DataScopeAspect.java

@@ -3,7 +3,6 @@ package com.ruoyi.framework.aspectj;
 import java.util.ArrayList;
 import java.util.List;
 
-import cn.hutool.core.util.StrUtil;
 import com.ruoyi.common.core.domain.BaseEntityPlus;
 import org.aspectj.lang.JoinPoint;
 import org.aspectj.lang.annotation.Aspect;

electripper-system/src/main/java/com/ruoyi/system/domain/EtArticle.java

@@ -27,6 +27,10 @@ public class EtArticle extends BaseEntity
     @Excel(name = "标题")
     private String title;
 
+    /** 运营区id */
+    @Excel(name = "运营区id")
+    private Long areaId;
+
     /** logo地址 */
     private String logo;
 

electripper-system/src/main/java/com/ruoyi/system/domain/EtFeeRule.java

@@ -28,6 +28,10 @@ public class EtFeeRule extends BaseEntity
     @Excel(name = "运营区id")
     private Long areaId;
 
+    /** 运营商id */
+    @Excel(name = "运营商id")
+    private Long deptId;
+
     /** 说明 */
     @Excel(name = "说明")
     private String explain;

electripper-system/src/main/java/com/ruoyi/system/service/impl/AsArticleClassifyServiceImpl.java

@@ -15,6 +15,7 @@ import com.ruoyi.system.service.IAsArticleClassifyService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
@@ -28,7 +29,7 @@ import java.util.stream.Collectors;
 @Service
 public class AsArticleClassifyServiceImpl implements IAsArticleClassifyService
 {
-    @Autowired
+    @Resource
     private AsArticleClassifyMapper articleClassifyMapper;
 
     /**
@@ -207,6 +208,12 @@ public class AsArticleClassifyServiceImpl implements IAsArticleClassifyService
     @Override
     public int insertClassify(AsArticleClassify dept)
     {
+        if(dept.getDeptId() == null){
+            SysUser currentUser = SecurityUtils.getLoginUser().getUser();//获取当前系统用户
+            if(!currentUser.isAdmin()){
+                dept.setDeptId(currentUser.getDeptId());
+            }
+        }
         AsArticleClassify info = articleClassifyMapper.selectClassifyById(dept.getParentId());
         // 如果父节点不为正常状态,则不允许新增子节点
         if (!UserConstants.DEPT_NORMAL.equals(info.getStatus()))

electripper-system/src/main/java/com/ruoyi/system/service/impl/EtFeeRuleServiceImpl.java

@@ -3,7 +3,9 @@ package com.ruoyi.system.service.impl;
 import java.util.List;
 
 import com.ruoyi.common.annotation.DataScope;
+import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.system.service.IAsUserService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -68,6 +70,12 @@ public class EtFeeRuleServiceImpl implements IEtFeeRuleService
     @Override
     public int insertEtFeeRule(EtFeeRule etFeeRule)
     {
+        if(etFeeRule.getDeptId() == null){
+            SysUser currentUser = SecurityUtils.getLoginUser().getUser();//获取当前系统用户
+            if(!currentUser.isAdmin()){
+                etFeeRule.setDeptId(currentUser.getDeptId());
+            }
+        }
         etFeeRule.setCreateTime(DateUtils.getNowDate());
         etFeeRule.setStatus("0");
         return etFeeRuleMapper.insertEtFeeRule(etFeeRule);

electripper-system/src/main/java/com/ruoyi/system/service/impl/EtModelServiceImpl.java

@@ -106,7 +106,7 @@ public class EtModelServiceImpl implements IEtModelService
     @Transactional
     public int insertEtModel(EtModel etModel)
     {
-        if(etModel.getOperator() != null){
+        if(etModel.getOperator() == null){
             SysUser currentUser = SecurityUtils.getLoginUser().getUser();//获取当前系统用户
             if(!currentUser.isAdmin()){
                 etModel.setOperator(currentUser.getDeptId());

electripper-system/src/main/resources/mapper/system/AsArticleClassifyMapper.xml

@@ -7,6 +7,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	<resultMap type="AsArticleClassify" id="AsArticleClassifyResult">
 		<id     property="classifyId"     column="classify_id"     />
 		<result property="parentId"   column="parent_id"   />
+		<result property="deptId"   column="dept_id"   />
 		<result property="ancestors"  column="ancestors"   />
 		<result property="classifyName"   column="classify_name"   />
 		<result property="orderNum"   column="order_num"   />
@@ -20,12 +21,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	</resultMap>
 
 	<sql id="selectClassifyVo">
-        select ac.classify_id, ac.parent_id, ac.ancestors, ac.classify_name, ac.order_num, ac.status, ac.del_flag, ac.create_by, ac.create_time
+        select ac.classify_id, ac.dept_id, ac.parent_id, ac.ancestors, ac.classify_name, ac.order_num, ac.status, ac.del_flag, ac.create_by, ac.create_time
         from et_article_classify ac
     </sql>
 
 	<select id="selectClassifyList" parameterType="AsArticleClassify" resultMap="AsArticleClassifyResult">
-        <include refid="selectClassifyVo"/>
+		select ac.classify_id, ac.dept_id, ac.parent_id, ac.ancestors, ac.classify_name, ac.order_num, ac.status, ac.del_flag, ac.create_by, ac.create_time
+		from et_article_classify ac
+		left join sys_dept d on d.dept_id = ac.dept_id
         where ac.del_flag = '0'
 		<if test="classifyId != null and classifyId != 0">
 			AND ac.classify_id = #{classifyId}
@@ -78,6 +81,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  		insert into et_article_classify(
  			<if test="classifyId != null and classifyId != 0">classify_id,</if>
  			<if test="parentId != null and parentId != 0">parent_id,</if>
+ 			<if test="deptId != null and deptId != 0">dept_id,</if>
  			<if test="classifyName != null and classifyName != ''">classify_name,</if>
  			<if test="ancestors != null and ancestors != ''">ancestors,</if>
  			<if test="orderNum != null">order_num,</if>
@@ -87,6 +91,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  		)values(
  			<if test="classifyId != null and classifyId != 0">#{classifyId},</if>
  			<if test="parentId != null and parentId != 0">#{parentId},</if>
+ 			<if test="deptId != null and deptId != 0">#{deptId},</if>
  			<if test="classifyName != null and classifyName != ''">#{classifyName},</if>
  			<if test="ancestors != null and ancestors != ''">#{ancestors},</if>
  			<if test="orderNum != null">#{orderNum},</if>
@@ -100,6 +105,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  		update et_article_classify
  		<set>
  			<if test="parentId != null and parentId != 0">parent_id = #{parentId},</if>
+ 			<if test="deptId != null and deptId != 0">dept_id = #{deptId},</if>
  			<if test="classifyName != null and classifyName != ''">classify_name = #{classifyName},</if>
  			<if test="ancestors != null and ancestors != ''">ancestors = #{ancestors},</if>
  			<if test="orderNum != null">order_num = #{orderNum},</if>

electripper-system/src/main/resources/mapper/system/AsArticleMapper.xml

@@ -8,6 +8,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="articleId"    column="article_id"    />
         <result property="classifyId"    column="classify_id"    />
         <result property="title"    column="title"    />
+        <result property="areaId"    column="area_id"    />
         <result property="logo"    column="logo"    />
         <result property="masterPicture"    column="master_picture"    />
         <result property="tag"    column="tag"    />
@@ -33,7 +34,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectAsArticleVo">
-        select article_id, classify_id, title, logo, master_picture, tag, is_hot, introduction, content, author, create_by, create_time, update_by, update_time, remark from et_article
+        select article_id, classify_id, title, area_id, logo, master_picture, tag, is_hot, introduction, content, author, create_by, create_time, update_by, update_time, remark from et_article
     </sql>
 
     <select id="selectAsArticleList" parameterType="EtArticle" resultMap="AsArticleResult">
@@ -62,6 +63,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="articleId != null">article_id,</if>
             <if test="classifyId != null and classifyId != ''">classify_id,</if>
             <if test="title != null and title != ''">title,</if>
+            <if test="areaId != null and areaId != ''">area_id,</if>
             <if test="logo != null">logo,</if>
             <if test="masterPicture != null">master_picture,</if>
             <if test="tag != null">tag,</if>
@@ -79,6 +81,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="articleId != null">#{articleId},</if>
             <if test="classifyId != null and classifyId != ''">#{classifyId},</if>
             <if test="title != null and title != ''">#{title},</if>
+            <if test="areaId != null and areaId != ''">#{areaId},</if>
             <if test="logo != null">#{logo},</if>
             <if test="masterPicture != null">#{masterPicture},</if>
             <if test="tag != null">#{tag},</if>
@@ -99,6 +102,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <trim prefix="SET" suffixOverrides=",">
             <if test="classifyId != null and classifyId != ''">classify_id = #{classifyId},</if>
             <if test="title != null and title != ''">title = #{title},</if>
+            <if test="areaId != null and areaId != ''">area_id = #{areaId},</if>
             <if test="logo != null">logo = #{logo},</if>
             <if test="masterPicture != null">master_picture = #{masterPicture},</if>
             <if test="tag != null">tag = #{tag},</if>

electripper-system/src/main/resources/mapper/system/EtFeeRuleMapper.xml

@@ -7,6 +7,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <resultMap type="EtFeeRule" id="EtFeeRuleResult">
         <result property="ruleId"    column="rule_id"    />
         <result property="areaId"       column="area_id"       />
+        <result property="deptId"       column="dept_id"       />
         <result property="name"    column="name"    />
         <result property="explain"    column="explain"    />
         <result property="status"    column="status"    />
@@ -26,19 +27,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectEtFeeRuleVo">
-        select rule_id, area_id, `name`, `explain`,
+        select rule_id, dept_id, dept_id, `name`, `explain`,
                status, auto_refund_deposit, order_exceed_minutes, order_exceed_warn,
                free_ride_time, rental_unit, riding_rule, riding_rule_json, charging_cycle, charging_cycle_value,
                capped_amount, instructions, create_by, create_time from et_fee_rule
     </sql>
 
     <select id="selectEtFeeRuleList" parameterType="EtFeeRule" resultMap="EtFeeRuleResult">
-        select r.rule_id, r.area_id, d.dept_name area,  r.`name`, r.`explain`,
+        select r.rule_id, r.dept_id, d.dept_name area,  r.`name`, r.`explain`,
         r.status, r.auto_refund_deposit, r.order_exceed_minutes, r.order_exceed_warn,
         r.free_ride_time, r.rental_unit, r.riding_rule, r.riding_rule_json, r.charging_cycle, r.charging_cycle_value,
         r.capped_amount, r.instructions, r.create_by, r.create_time from et_fee_rule r
-        left join et_area_dept ad on ad.area_id = r.area_id
+        left join sys_dept d on d.dept_id = r.dept_id
-        left join sys_dept d on d.dept_id = ad.dept_id
         where 1 = 1
         <if test="name != null  and name != ''"> and r.`name` like concat('%', #{name}, '%')</if>
         <if test="status != null  and status != ''"> and r.status = #{status}</if>
@@ -60,7 +60,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
     <select id="selectRuleInfoListByAreaId" parameterType="Long" resultMap="EtFeeRuleResult">
-        select r.rule_id, r.`area_id`, r.`name`, r.`explain`,
+        select r.rule_id, r.`dept_id`, r.`name`, r.`explain`,
                r.status, r.auto_refund_deposit, r.order_exceed_minutes, r.order_exceed_warn,
                r.free_ride_time, r.rental_unit, r.riding_rule, r.riding_rule_json, r.charging_cycle, r.charging_cycle_value,
                r.capped_amount, r.instructions, r.create_by, r.create_time
@@ -82,7 +82,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         insert into et_fee_rule
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="name != null">`name`,</if>
-            <if test="areaId != null">area_id,</if>
+            <if test="deptId != null">dept_id,</if>
             <if test="explain != null">`explain`,</if>
             <if test="status != null">status,</if>
             <if test="autoRefundDeposit != null">auto_refund_deposit,</if>
@@ -101,7 +101,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="name != null">#{name},</if>
-            <if test="areaId != null">#{areaId},</if>
+            <if test="deptId != null">#{deptId},</if>
             <if test="explain != null">#{explain},</if>
             <if test="status != null">#{status},</if>
             <if test="autoRefundDeposit != null">#{autoRefundDeposit},</if>
@@ -124,7 +124,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         update et_fee_rule
         <trim prefix="SET" suffixOverrides=",">
             <if test="name != null">`name` = #{name},</if>
-            <if test="areaId != null">area_id = #{areaId},</if>
+            <if test="deptId != null">dept_id = #{deptId},</if>
             <if test="explain != null">`explain` = #{explain},</if>
             <if test="status != null">status = #{status},</if>
             <if test="autoRefundDeposit != null">auto_refund_deposit = #{autoRefundDeposit},</if>