提交APP权限单独处理

补充部门字段

lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppEnterpriseComplaintController.java

@@ -47,9 +47,18 @@ public class AppEnterpriseComplaintController extends BaseController {
         List<EnterpriseComplaint> list = enterpriseComplaintService.selectEnterpriseComplaintList(enterpriseComplaint);
         return getDataTable(list);
     }
-
     /**
-     * 新增企业执法-在线投诉
+     * 查询企业执法-在线投诉列表
+     */
+    @GetMapping("/queryList")
+    @ResponseBody
+    public ZDResponse queryList(EnterpriseComplaint enterpriseComplaint) {
+        List<EnterpriseComplaint> list = enterpriseComplaintService.selectEnterpriseComplaintList(enterpriseComplaint);
+        return ZDResponse.success("投诉列表查询成功",list);
+    }
+
+    /**在线投诉
+     * 新增企业执法-
      */
     @GetMapping("/add")
     public String add() {

lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppSystemController.java

@@ -58,7 +58,9 @@ public class AppSystemController extends BaseController {
 //        UserBean user = userApi.getCurrentUser();
         UserBean user = userApi.getUserByUserId(userId);
         DeptBean dept = deptApi.getDeptById(user.getDeptId());
+        DeptBean dept1 = deptApi.iterationDeptParent(user.getDeptId());
         user.setDept(dept);
+        user.setBureauDept(dept1);
         return ZDResponse.success("查询成功",user);
     }
 

lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppThirdLoginController.java

@@ -153,8 +153,9 @@ public class AppThirdLoginController {
 
 //            UserBean userBean = userApi.getUserByUserStrId(userId);
             User user = iUserService.selectUserByLoginName(userId);
+            // todo:这里需要将转换出来的User存redis用于做权限
+            redisCache.setCacheObject("shiro:app:"+user.getUserId(), user);
 
-            redisCache.setCacheObject("shiro:app:"+user.getUserId(), user); // todo:这里需要将转换出来的User存redis用于做权限
             return thirdLoginService.szyLogin(user.getLoginName());
         } catch (Exception e) {
             e.printStackTrace();

lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/feign/DeptApiImpl.java

@@ -5,15 +5,14 @@ import com.zdxt.auth.dto.DeptBean;
 import com.zdxt.auth.project.system.dept.mapper.DeptMapper;
 import com.zdxt.auth.project.system.dept.service.IDeptService;
 import com.zdxt.common.annotation.DataScope;
+import com.zdxt.common.util.SpringUtil;
+import com.zdxt.common.util.StringUtils;
 import com.zdxt.domain.auth.Dept;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
 import org.springframework.stereotype.Service;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 /**
  * Author: kylin
@@ -220,4 +219,18 @@ public class DeptApiImpl implements DeptApi {
     }
 
 
+    // 递归获取部门
+    public DeptBean iterationDeptParent(String deptId) {
+        DeptApi deptApi = SpringUtil.getBean(DeptApi.class);
+        DeptBean dept = deptApi.getDeptById(deptId);
+        Optional op =Optional.ofNullable(dept);
+        if(!op.isPresent() || deptId == null)return null; // 防止admin这种没有部门的进来后造成死循环
+        if (StringUtils.isNotEmpty(dept.getDeptType())) {
+            String type=dept.getDeptType().toLowerCase();
+            if(type.indexOf("bl")!=-1 ){
+                return dept;
+            }
+        }
+        return iterationDeptParent(dept.getParentId());
+    }
 }

lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/framework/config/ResourcesConfig.java

@@ -67,7 +67,8 @@ public class ResourcesConfig implements WebMvcConfigurer
                 .addPathPatterns("/app/**")
                 .excludePathPatterns("/app/thirdLogin/siqLogin","/app/thirdLogin/siqLoginTest",
                         "/app/thirdLogin/getSiqCode",
-                        "/app/thirdLogin/szyptLogin/**"
+                        "/app/thirdLogin/szyptLogin/**",
+                        "/app/thirdLogin/testLogin"
                         );
 //         除了登录放行，其他接口都token验证
     }

lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/framework/config/ShiroConfig.java

@@ -290,7 +290,7 @@ public class ShiroConfig {
         filterChainDefinitionMap.put("/appAjaxLogin", "anon");
         filterChainDefinitionMap.put("/app/appLogin", "anon");
         filterChainDefinitionMap.put("/app/thirdLogin/testLogin", "anon");
-//        filterChainDefinitionMap.put("/app/**", "anon");
+        filterChainDefinitionMap.put("/app/**", "anon");
         filterChainDefinitionMap.put("/app-z/**", "anon");
         filterChainDefinitionMap.put("/Cesium-1.95/**", "anon");
         // 临时放开附件, 不然浏览器玩不了

lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/EnforcementRegistration.java

@@ -102,6 +102,16 @@ public class EnforcementRegistration extends BaseDomain
      */
     private Integer isSubmit;
 
+
+    /**
+     * 局级部门ID
+     */
+    private String bureauDeptId;
+    /**
+     * 局级部门名称
+     */
+    private String bureauDeptName;
+
     /**
      * 文件几个
      */
@@ -537,4 +547,20 @@ public class EnforcementRegistration extends BaseDomain
     public void setCheckCategory(String checkCategory) {
         this.checkCategory = checkCategory;
     }
+
+    public String getBureauDeptId() {
+        return bureauDeptId;
+    }
+
+    public void setBureauDeptId(String bureauDeptId) {
+        this.bureauDeptId = bureauDeptId;
+    }
+
+    public String getBureauDeptName() {
+        return bureauDeptName;
+    }
+
+    public void setBureauDeptName(String bureauDeptName) {
+        this.bureauDeptName = bureauDeptName;
+    }
 }

lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/EnterpriseLawEnforcement.java

@@ -84,6 +84,15 @@ public class EnterpriseLawEnforcement extends BaseDomain
      */
     private Integer isSubmit;
 
+    /**
+     * 局级部门ID
+     */
+    private String bureauDeptId;
+    /**
+     * 局级部门名称
+     */
+    private String bureauDeptName;
+
     /**
      * 搜索关键字
      */
@@ -452,6 +461,22 @@ public class EnterpriseLawEnforcement extends BaseDomain
         this.lawCertificateNum = lawCertificateNum;
     }
 
+    public String getBureauDeptId() {
+        return bureauDeptId;
+    }
+
+    public void setBureauDeptId(String bureauDeptId) {
+        this.bureauDeptId = bureauDeptId;
+    }
+
+    public String getBureauDeptName() {
+        return bureauDeptName;
+    }
+
+    public void setBureauDeptName(String bureauDeptName) {
+        this.bureauDeptName = bureauDeptName;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementRegistrationMapper.xml

@@ -41,6 +41,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="enforceReason"    column="enforce_reason"    />
         <result property="lawField"    column="law_field"    />
         <result property="checkCategory"    column="check_category"    />
+        <result property="bureauDeptId"    column="bureau_dept_id"    />
+        <result property="bureauDeptName"    column="bureau_dept_name"    />
     </resultMap>
 
     <resultMap type="com.zdxt.code.domain.EnforceRegCount" id="EnforceRegCountResult">
@@ -55,7 +57,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
          law_enforcer_tel, law_enforcer_two, law_enforcer_id_two, law_enforcer_tel_two, subsidiaryer,
          subsidiaryer_id, subsidiaryer_tel, law_enforcement_item, law_enforcement_item_text,
          law_enforcement_basis, remark, reslut, user_id, dept_id, is_delete, status, law_enforcement_code,
-         is_complaint,is_submit, unite_check,check_css, enforce_reason, law_field,check_category from enforcement_registration
+         is_complaint,is_submit, unite_check,check_css, enforce_reason, law_field,check_category,
+         bureau_dept_id,bureau_dept_name
+          from enforcement_registration
     </sql>
 
     <select id="selectEnforcementRegistrationList" parameterType="EnforcementRegistration" resultMap="EnforcementRegistrationResult">
@@ -172,6 +176,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="uniteCheck != null and uniteCheck != ''"> unite_check,</if>
             <if test="lawField != null and lawField != ''"> law_field,</if>
             <if test="checkCategory != null and checkCategory != ''"> check_category,</if>
+            <if test="bureauDeptName != null and bureauDeptName != ''"> bureau_dept_name,</if>
+            <if test="bureauDeptId != null and bureauDeptId != ''"> bureau_dept_id,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null  and id != ''">#{id},</if>
@@ -210,6 +216,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="uniteCheck != null and uniteCheck != ''"> #{uniteCheck},</if>
             <if test="lawField != null and lawField != ''"> #{lawField},</if>
             <if test="checkCategory != null and checkCategory != ''"> #{checkCategory},</if>
+            <if test="bureauDeptName != null and bureauDeptName != ''"> #{bureauDeptName},</if>
+            <if test="bureauDeptId != null and bureauDeptId != ''"> #{bureauDeptId},</if>
          </trim>
     </insert>
 
@@ -250,6 +258,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="isSubmit != null ">is_submit =  #{isSubmit},</if>
             <if test="lawField != null and lawField != ''"> law_field = #{lawField},</if>
             <if test="checkCategory != null and checkCategory != ''"> check_category = #{checkCategory},</if>
+            <if test="bureauDeptName != null and bureauDeptName != ''"> bureau_dept_name = #{bureauDeptName},</if>
+            <if test="bureauDeptId != null and bureauDeptId != ''"> bureau_dept_id = #{bureauDeptId},</if>
         </trim>
         where id = #{id}
     </update>

lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnterpriseLawEnforcementMapper.xml

@@ -33,10 +33,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="checkItemText"    column="check_item_text"    />
         <result property="checkRequire"    column="check_require"    />
         <result property="checkRequireText"    column="check_require_text"    />
+        <result property="bureauDeptId"    column="bureau_dept_id"    />
+        <result property="bureauDeptName"    column="bureau_dept_name"    />
     </resultMap>
 
     <sql id="selectEnterpriseLawEnforcementVo">
-        select id, law_enforcement, law_enforcement_id, enterprise_id, enterprise_name, check_time, create_time, create_by, law_enforcer, law_enforcer_id, law_enforcer_two, law_enforcer_two_id, remark, user_id, dept_id, is_delete, status, law_enforcement_code, link_man, link_tel, check_item, check_item_text, check_require, check_require_text, enterprise_number,is_submit, unite_check, is_unite, is_reg, main_deputy_order, tmp_dept_json from enterprise_law_enforcement
+        select id, law_enforcement, law_enforcement_id, enterprise_id, enterprise_name, check_time,
+        create_time, create_by, law_enforcer, law_enforcer_id, law_enforcer_two, law_enforcer_two_id,
+        remark, user_id, dept_id, is_delete, status, law_enforcement_code, link_man, link_tel, check_item,
+        check_item_text, check_require, check_require_text, enterprise_number,is_submit, unite_check, is_unite,
+        is_reg, main_deputy_order, tmp_dept_json,bureau_dept_id,bureau_dept_name
+        from enterprise_law_enforcement
     </sql>
 
     <select id="selectEnterpriseLawEnforcementList" parameterType="EnterpriseLawEnforcement" resultMap="EnterpriseLawEnforcementResult">
@@ -151,6 +158,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="isReg != null and isReg != ''">is_reg,</if>
             <if test="mainDeputyOrder != null">main_deputy_order,</if>
             <if test="tmpDeptJson != null and tmpDeptJson != ''">tmp_dept_json,</if>
+            <if test="bureauDeptName != null and bureauDeptName != ''"> bureau_dept_name,</if>
+            <if test="bureauDeptId != null and bureauDeptId != ''"> bureau_dept_id,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null  and id != ''">#{id},</if>
@@ -184,6 +193,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="isReg != null  and isReg != ''">#{isReg},</if>
             <if test="mainDeputyOrder != null">#{mainDeputyOrder},</if>
             <if test="tmpDeptJson != null and tmpDeptJson != ''">#{tmpDeptJson},</if>
+            <if test="bureauDeptName != null and bureauDeptName != ''"> #{bureauDeptName},</if>
+            <if test="bureauDeptId != null and bureauDeptId != ''"> #{bureauDeptId},</if>
          </trim>
     </insert>
 
@@ -218,6 +229,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="isReg != null  and isReg != ''">is_reg = #{isReg},</if>
             <if test="mainDeputyOrder != null ">main_deputy_order = #{mainDeputyOrder},</if>
             <if test="tmpDeptJson != null and tmpDeptJson != ''">tmp_dept_json = #{tmpDeptJson},</if>
+            <if test="bureauDeptName != null and bureauDeptName != ''"> bureau_dept_name = #{bureauDeptName},</if>
+            <if test="bureauDeptId != null and bureauDeptId != ''"> bureau_dept_id = #{bureauDeptId},</if>
         </trim>
         where id = #{id}
     </update>

lib/EmergencyServiceApi/emergencyAuthServiceApi/src/main/java/com/zdxt/auth/dto/UserBean.java

@@ -165,6 +165,11 @@ public class UserBean implements Serializable {
     /** 区别是否执法人员 */
     private Boolean lawOfficer;
 
+    /**
+     * 局级部门
+     */
+    private DeptBean bureauDept;
+
     public Boolean getLawOfficer() {
         return lawOfficer;
     }
@@ -500,6 +505,14 @@ public class UserBean implements Serializable {
         this.units = units;
     }
 
+    public DeptBean getBureauDept() {
+        return bureauDept;
+    }
+
+    public void setBureauDept(DeptBean bureauDept) {
+        this.bureauDept = bureauDept;
+    }
+
     @Override
     public String toString() {
         return "UserBean{" +

lib/EmergencyServiceApi/emergencyAuthServiceApi/src/main/java/com/zdxt/auth/feign/DeptApi.java

@@ -107,4 +107,11 @@ public interface DeptApi {
     @ApiOperation("根据父节点获取其下所有部门信息")
     public List<DeptBean> selectDeptByParentId(DeptBean dept);
 
+    /**
+     * 查询当前人部门所在部门
+     * @param deptId
+     * @return
+     */
+    public DeptBean iterationDeptParent(String deptId);
+
 }