diff --git a/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppEnterpriseComplaintController.java b/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppEnterpriseComplaintController.java index bebe9bc1..ab9f7ddc 100644 --- a/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppEnterpriseComplaintController.java +++ b/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppEnterpriseComplaintController.java @@ -47,9 +47,18 @@ public class AppEnterpriseComplaintController extends BaseController { List list = enterpriseComplaintService.selectEnterpriseComplaintList(enterpriseComplaint); return getDataTable(list); } - /** - * 新增企业执法-在线投诉 + * 查询企业执法-在线投诉列表 + */ + @GetMapping("/queryList") + @ResponseBody + public ZDResponse queryList(EnterpriseComplaint enterpriseComplaint) { + List list = enterpriseComplaintService.selectEnterpriseComplaintList(enterpriseComplaint); + return ZDResponse.success("投诉列表查询成功",list); + } + + /**在线投诉 + * 新增企业执法- */ @GetMapping("/add") public String add() { diff --git a/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppSystemController.java b/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppSystemController.java index 59d0e01b..54f69534 100644 --- a/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppSystemController.java +++ b/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); } diff --git a/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppThirdLoginController.java b/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppThirdLoginController.java index a51813f7..1e5804a1 100644 --- a/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppThirdLoginController.java +++ b/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(); diff --git a/lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/feign/DeptApiImpl.java b/lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/feign/DeptApiImpl.java index fc145544..50437c0f 100644 --- a/lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/feign/DeptApiImpl.java +++ b/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()); + } } diff --git a/lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/framework/config/ResourcesConfig.java b/lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/framework/config/ResourcesConfig.java index 073dcc0f..b0b5a332 100644 --- a/lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/framework/config/ResourcesConfig.java +++ b/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验证 } diff --git a/lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/framework/config/ShiroConfig.java b/lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/framework/config/ShiroConfig.java index 7a2d9a6c..2bc1ac35 100644 --- a/lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/framework/config/ShiroConfig.java +++ b/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"); // 临时放开附件, 不然浏览器玩不了 diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/EnforcementRegistration.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/EnforcementRegistration.java index 37b5c026..85fe93b4 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/EnforcementRegistration.java +++ b/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; + } } diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/EnterpriseLawEnforcement.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/EnterpriseLawEnforcement.java index 5c6208dc..6ce765b2 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/EnterpriseLawEnforcement.java +++ b/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) diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementRegistrationMapper.xml b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementRegistrationMapper.xml index 7ce4d912..75d75db9 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementRegistrationMapper.xml +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementRegistrationMapper.xml @@ -41,6 +41,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + @@ -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 @@ -151,6 +158,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" is_reg, main_deputy_order, tmp_dept_json, + bureau_dept_name, + bureau_dept_id, #{id}, @@ -184,6 +193,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{isReg}, #{mainDeputyOrder}, #{tmpDeptJson}, + #{bureauDeptName}, + #{bureauDeptId}, @@ -218,6 +229,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" is_reg = #{isReg}, main_deputy_order = #{mainDeputyOrder}, tmp_dept_json = #{tmpDeptJson}, + bureau_dept_name = #{bureauDeptName}, + bureau_dept_id = #{bureauDeptId}, where id = #{id} diff --git a/lib/EmergencyServiceApi/emergencyAuthServiceApi/src/main/java/com/zdxt/auth/dto/UserBean.java b/lib/EmergencyServiceApi/emergencyAuthServiceApi/src/main/java/com/zdxt/auth/dto/UserBean.java index f3c7a724..9a832c06 100644 --- a/lib/EmergencyServiceApi/emergencyAuthServiceApi/src/main/java/com/zdxt/auth/dto/UserBean.java +++ b/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{" + diff --git a/lib/EmergencyServiceApi/emergencyAuthServiceApi/src/main/java/com/zdxt/auth/feign/DeptApi.java b/lib/EmergencyServiceApi/emergencyAuthServiceApi/src/main/java/com/zdxt/auth/feign/DeptApi.java index bc42a538..1064a99e 100644 --- a/lib/EmergencyServiceApi/emergencyAuthServiceApi/src/main/java/com/zdxt/auth/feign/DeptApi.java +++ b/lib/EmergencyServiceApi/emergencyAuthServiceApi/src/main/java/com/zdxt/auth/feign/DeptApi.java @@ -107,4 +107,11 @@ public interface DeptApi { @ApiOperation("根据父节点获取其下所有部门信息") public List selectDeptByParentId(DeptBean dept); + /** + * 查询当前人部门所在部门 + * @param deptId + * @return + */ + public DeptBean iterationDeptParent(String deptId); + }