huanghai
/
dsProject
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

'commit'

Browse Source
main
HuangHai 3 months ago
parent 7a1d551334
commit d131f59053
4 changed files with 37 additions and 43 deletions
Show Stats Download Patch File Download Diff File

51
dsBase/src/main/java/com/dsideal/dsBase/Base/Controller/BaseController.java
Unescape View File

@ -3,7 +3,7 @@ package com.dsideal.dsBase.Base.Controller;
import com.alibaba.fastjson.JSONObject;
import com.dsideal.dsBase.Base.Model.BaseModel;
import com.dsideal.dsBase.Bean.TBaseOrgTypePrincipalship;
import com.dsideal.dsBase.Handler.RepeatIntercetpor;
import com.dsideal.dsBase.Handler.RepeatInterceptor;
import com.dsideal.dsBase.Interceptor.*;
import com.dsideal.dsBase.Util.CommonUtil;
import com.dsideal.dsBase.Util.ExcelCommonUtil;
@ -12,7 +12,6 @@ import com.jfinal.aop.Before;
import com.jfinal.core.Controller;
import com.jfinal.ext.interceptor.GET;
import com.jfinal.ext.interceptor.POST;
import com.jfinal.kit.Kv;
import com.jfinal.kit.PathKit;
import com.jfinal.kit.PropKit;
import com.jfinal.kit.StrKit;
@ -30,7 +29,7 @@ public class BaseController extends Controller {
* 获取当前登录人员的Session信息
* from:默认是0，表示从本地数据库中取，1：表示从第三方系统数据库中取
*/
@Before({GET.class, RepeatIntercetpor.class})
@Before({GET.class, RepeatInterceptor.class})
public void getCurrentPersonInfo(int from) {
Map<String, Object> map = new HashMap<>();
Record rPerson = JwtUtil.getPersonInfo(getRequest());
@ -48,7 +47,7 @@ public class BaseController extends Controller {
/**
* 获取整个单位类型与职务+分管信息树数据
*/
@Before({GET.class, RepeatIntercetpor.class})
@Before({GET.class, RepeatInterceptor.class})
@IsSysAdminInterface({"1"})
public void getOrgTypePrincipalshipTree() {
List<Record> dt = bm.getOrgTypePrincipalshipTree();
@ -76,7 +75,7 @@ public class BaseController extends Controller {
/**
* 获取单位类型与职务+分管信息树数据指定结点的信息
*/
@Before({GET.class, RepeatIntercetpor.class})
@Before({GET.class, RepeatInterceptor.class})
@IsNumericInterface({"id"})
@IsSysAdminInterface({"1"})
public void getOrgTypePrincipalshipById(String id) {
@ -87,7 +86,7 @@ public class BaseController extends Controller {
/**
* 获取单位类型与职务+分管信息树数据指定结点下一级的数据ById
*/
@Before({GET.class, RepeatIntercetpor.class})
@Before({GET.class, RepeatInterceptor.class})
@IsSysAdminInterface({"1", "2", "3", "4"})
public void getOrgTypePrincipalshipForTreeTable(int parent_id, int is_school, String bureau_id) {
List<Record> list = bm.getOrgTypePrincipalship(parent_id, is_school, bureau_id);
@ -140,7 +139,7 @@ public class BaseController extends Controller {
*
* @param parent_code
*/
@Before({GET.class, RepeatIntercetpor.class})
@Before({GET.class, RepeatInterceptor.class})
@IsNumericInterface({"parent_code"})
@IsSysAdminInterface({"1"})
public void getOrgTypePrincipalshipByParentCode(String parent_code) {
@ -157,7 +156,7 @@ public class BaseController extends Controller {
* @param is_school
* @param code
*/
@Before({POST.class, RepeatIntercetpor.class})
@Before({POST.class, RepeatInterceptor.class})
@EmptyInterface({"code", "name"})
@IsNumericInterface({"parent_id", "sort_id"})
@LengthInterface({"code,2,2", "name,2,32"})
@ -191,7 +190,7 @@ public class BaseController extends Controller {
*
* @param id
*/
@Before({POST.class, RepeatIntercetpor.class})
@Before({POST.class, RepeatInterceptor.class})
@IsNumericInterface({"id"})
@IsSysAdminInterface({"1"})
public void delOrgTypePrincipalshipById(int id) {
@ -221,7 +220,7 @@ public class BaseController extends Controller {
* @param code
* @param is_school
*/
@Before({POST.class, RepeatIntercetpor.class})
@Before({POST.class, RepeatInterceptor.class})
@EmptyInterface({"code", "name"})
@IsNumericInterface({"id", "parent_id", "sort_id", "b_use"})
@IsSysAdminInterface({"1"})
@ -261,7 +260,7 @@ public class BaseController extends Controller {
*
* @param bureau_id
*/
@Before({GET.class, RepeatIntercetpor.class})
@Before({GET.class, RepeatInterceptor.class})
@EmptyInterface({"bureau_id"})
@IsGuidInterface({"bureau_id"})
@IsSysAdminInterface({"1", "2", "3", "4"})
@ -273,7 +272,7 @@ public class BaseController extends Controller {
/**
* 输出打印职务与分管工作的数据，方便第三方系统接入时，提供填写EXCEL示例
*/
@Before({GET.class, RepeatIntercetpor.class})
@Before({GET.class, RepeatInterceptor.class})
public void getPrincipalshipThirdParty() {
Page<Record> dt = bm.getPrincipalshipThirdParty(1, 10000);
renderJson(CommonUtil.renderJsonForLayUI(dt));
@ -282,7 +281,7 @@ public class BaseController extends Controller {
/**
* 输出打印职务与分管工作的数据
*/
@Before({GET.class, RepeatIntercetpor.class})
@Before({GET.class, RepeatInterceptor.class})
public void getPrincipalshipThirdPartyForExcel() {
//模板文件
String excelPath = PathKit.getRootClassPath() + PropKit.get("excelExportTemplatePathSuffix").replace("\\", "/");
@ -303,7 +302,7 @@ public class BaseController extends Controller {
*
* @param ids
*/
@Before({GET.class, RepeatIntercetpor.class})
@Before({GET.class, RepeatInterceptor.class})
public void isInDutyList(String ids) {
Record rPerson = JwtUtil.getPersonInfo(getRequest());
String person_id = rPerson.getStr("person_id");
@ -314,7 +313,7 @@ public class BaseController extends Controller {
/**
* 获取所有的用户城市列表
*/
@Before({GET.class, RepeatIntercetpor.class})
@Before({GET.class, RepeatInterceptor.class})
public void getAllUserCity() {
List<Record> list = bm.getAllUserCity();
renderJson(CommonUtil.renderJsonForLayUI(list, list.size()));
@ -325,7 +324,7 @@ public class BaseController extends Controller {
*
* @param bureau_id
*/
@Before({GET.class, RepeatIntercetpor.class})
@Before({GET.class, RepeatInterceptor.class})
public void selectPersonsByBureauId(String bureau_id) {
//如果不传入单位ID,即当前操作人员的单位ID
if (StrKit.isBlank(bureau_id)) {
@ -359,7 +358,7 @@ public class BaseController extends Controller {
*
* @return
*/
@Before({GET.class, RepeatIntercetpor.class})
@Before({GET.class, RepeatInterceptor.class})
public void getTermListByYear(int batch_year) {
List<Record> list = bm.getTermListByYear(batch_year);
renderJson(CommonUtil.renderJsonForLayUI(list, list.size()));
@ -370,7 +369,7 @@ public class BaseController extends Controller {
* 作者：黄海
* 时间：2019-10-30
*/
@Before({GET.class, RepeatIntercetpor.class})
@Before({GET.class, RepeatInterceptor.class})
public void getCurrentTerm() {
Record record = bm.getCurrentTerm();
renderJson(record);
@ -381,7 +380,7 @@ public class BaseController extends Controller {
* 作者：黄海
* 时间：2021-08-17
*/
@Before({GET.class, RepeatIntercetpor.class})
@Before({GET.class, RepeatInterceptor.class})
public void getCurrentPerson() {
Record rPerson = JwtUtil.getPersonInfo(getRequest());
String person_id = rPerson.getStr("person_id");
@ -394,7 +393,7 @@ public class BaseController extends Controller {
* 作者：黄海
* 时间：2021-08-18
*/
@Before({GET.class, RepeatIntercetpor.class})
@Before({GET.class, RepeatInterceptor.class})
public void getCurrentClass() {
Record rPerson = JwtUtil.getPersonInfo(getRequest());
String person_id = rPerson.getStr("person_id");
@ -408,7 +407,7 @@ public class BaseController extends Controller {
* 作者：黄海
* 时间：2019-10-18
*/
@Before({GET.class, RepeatIntercetpor.class})
@Before({GET.class, RepeatInterceptor.class})
public void getSiteTypeList() {
List<Record> list = bm.getSiteTypeList();
renderJson(CommonUtil.renderJsonForLayUI(list, list.size()));
@ -421,7 +420,7 @@ public class BaseController extends Controller {
* @param xq_id
* @return
*/
@Before({GET.class, RepeatIntercetpor.class})
@Before({GET.class, RepeatInterceptor.class})
public void getTermInfo(int xq_id) {
Record record = bm.getTermInfo(xq_id);
renderJson(record);
@ -433,7 +432,7 @@ public class BaseController extends Controller {
* @param teacher_id
* @return
*/
@Before({GET.class, RepeatIntercetpor.class})
@Before({GET.class, RepeatInterceptor.class})
public void getPersonInfo(String teacher_id) {
if (StrKit.isBlank(teacher_id)) {
Record rPerson = JwtUtil.getPersonInfo(getRequest());
@ -453,7 +452,7 @@ public class BaseController extends Controller {
*
* @param xq_id
*/
@Before({POST.class, RepeatIntercetpor.class})
@Before({POST.class, RepeatInterceptor.class})
public void saveTermId(String xq_id) {
bm.saveTermId(xq_id);
renderJson(CommonUtil.returnMessageJson(true, "保存成功"));
@ -471,7 +470,7 @@ public class BaseController extends Controller {
* @param ksrq
* @param jsrq
*/
@Before({POST.class, RepeatIntercetpor.class})
@Before({POST.class, RepeatInterceptor.class})
@LengthInterface({"xn,4,4"})
public void updateXq(int xq_id, String xn, String xq_code, String ksrq, String jsrq) {
BaseModel.updateXq(xq_id, xn, xq_code, ksrq, jsrq);
@ -486,7 +485,7 @@ public class BaseController extends Controller {
* @param org_id
* @return
*/
@Before({GET.class, RepeatIntercetpor.class})
@Before({GET.class, RepeatInterceptor.class})
public void getPersonList(String org_id) {
List<Record> list = bm.getPersonList(org_id);
renderJson(CommonUtil.renderJsonForLayUI(list, list.size()));

2
dsBase/src/main/java/com/dsideal/dsBase/Handler/RepeatIntercetpor.java → dsBase/src/main/java/com/dsideal/dsBase/Handler/RepeatInterceptor.java
Unescape View File

@ -6,7 +6,7 @@ import com.jfinal.aop.Invocation;
import com.jfinal.core.Controller;
import com.jfinal.plugin.activerecord.Record;
public class RepeatIntercetpor implements Interceptor {
public class RepeatInterceptor implements Interceptor {
private final static long timeOut = 1;//1秒之内，同一个用户，同一个接口，只能调用一次
@Override

14
dsBase/src/main/java/com/dsideal/dsBase/Organization/Controller/OrganizationController.java
Unescape View File

@ -1,7 +1,7 @@
package com.dsideal.dsBase.Organization.Controller;
import com.dsideal.dsBase.Dm.Model.DmModel;
import com.dsideal.dsBase.Handler.RepeatIntercetpor;
import com.dsideal.dsBase.Handler.RepeatInterceptor;
import com.dsideal.dsBase.Interceptor.*;
import com.dsideal.dsBase.LoginPerson.Model.LoginPersonModel;
import com.dsideal.dsBase.Organization.Model.OrganizationModel;
@ -56,7 +56,7 @@ public class OrganizationController extends Controller {
* @param property_id
* @param level_id
*/
@Before({POST.class, RepeatIntercetpor.class})
@Before({POST.class, RepeatInterceptor.class})
@EmptyInterface({"org_code", "org_name", "parent_org_id"})
@IsNumericInterface({"org_type_id", "sort_id", "school_type_id"})
@IsSysAdminInterface({"1", "2", "3"}) //是不是1，2，3号管理员
@ -123,7 +123,7 @@ public class OrganizationController extends Controller {
* @param sort_id
* @param main_school_id
*/
@Before({POST.class, RepeatIntercetpor.class})
@Before({POST.class, RepeatInterceptor.class})
@EmptyInterface({"org_code", "bureau_name", "parent_org_id", "main_school_id", "bureau_id", "property_id"})
@IsNumericInterface({"sort_id"})
@IsSysAdminInterface({"1", "2", "3"}) //是不是1，2，3号管理员
@ -148,7 +148,7 @@ public class OrganizationController extends Controller {
*
* @param bureau_id
*/
@Before({POST.class, RepeatIntercetpor.class})
@Before({POST.class, RepeatInterceptor.class})
@EmptyInterface({"bureau_id"})
@IsSysAdminInterface({"1", "2", "3"}) //是不是1，2，3号管理员
//是不是有权限操作这个单位或区域下的数据？
@ -296,7 +296,7 @@ public class OrganizationController extends Controller {
* @param parent_org_id
* @param sort_id
*/
@Before({POST.class, RepeatIntercetpor.class})
@Before({POST.class, RepeatInterceptor.class})
@EmptyInterface({"parent_org_id", "org_name"})
@IsNumericInterface({"sort_id"})
@ -347,7 +347,7 @@ public class OrganizationController extends Controller {
* @param sort_id
* @param main_school_id
*/
@Before({POST.class, RepeatIntercetpor.class})
@Before({POST.class, RepeatInterceptor.class})
@EmptyInterface({"org_id", "org_name", "parent_org_id", "main_school_id"})
@IsNumericInterface({"sort_id"})
@ -376,7 +376,7 @@ public class OrganizationController extends Controller {
*
* @param org_id
*/
@Before({POST.class, RepeatIntercetpor.class})
@Before({POST.class, RepeatInterceptor.class})
@EmptyInterface({"org_id"})
@IsSysAdminInterface({"1", "2", "3", "4"}) //超级管理员与单位管理员才可以删除部门

13
dsBase/src/main/java/com/dsideal/dsBase/Util/JwtUtil.java
Unescape View File

@ -75,7 +75,10 @@ public class JwtUtil {
jwtToken = CookieUtil.getValue(req, "jwt-token");
}
Record record = new Record();
Claims claims = getClaims(jwtToken);
Claims claims = null;
if (jwtToken != null) {
claims = getClaims(jwtToken);
}
if (claims != null) {
record.set("identity_id", claims.get("identity_id"));
record.set("person_id", claims.get("person_id"));
@ -84,12 +87,4 @@ public class JwtUtil {
}
return record;
}
public static void main(String[] args) {
String token = generateToken(4, "0b64e31e-a85e-43eb-ba5f-3088d986a8da", "3f7f4c90-645a-4fb9-9902-447846cf1dcc");
System.out.println(token);
//Record record = getPersonInfo(token);
// System.out.println(record);
}
}
Write Preview
Loading…
Cancel
Save