Skip to content

C
cnooc_zydeepen-cggl_expert-manage-miniapp
Commit 8245c32f by 刘红梅
Options

Merge branch 'master' of http://git.gdatac.com/sundelong/cnooc_zydeepen-cggl_expert-manage-miniapp

parents b5a5e3f2 d8591f38
Showing with 242 additions and 2 deletions
src/main/java/com/cnooc/expert/config/TheWebMvcConfigurer.java
......@@ -11,6 +11,33 @@ import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
@Configuration
public class TheWebMvcConfigurer implements WebMvcConfigurer {
<<<<<<< HEAD
// @Autowired
// private LoginInterceptor loginInterceptor;
//
// @Override
// public void addInterceptors(InterceptorRegistry registry) {
//
// // 注册登录拦截器，并设置拦截路径和排除路径
// registry.addInterceptor(loginInterceptor)
// .addPathPatterns("/**") // 拦截所有路径
// .excludePathPatterns( // 排除一些路径
// "/sys/**",
// "/verify/**",
// "/person/**",
// "/text/**",
// "/error/**",
// "/error"
// );
//
// registry.addInterceptor(webAuthInterceptor());
// }
//
// @Bean
// public WebAuthInterceptor webAuthInterceptor() {
// return new WebAuthInterceptor();
// }
=======
@Autowired
private LoginInterceptor loginInterceptor;
......@@ -36,5 +63,6 @@ public class TheWebMvcConfigurer implements WebMvcConfigurer {
public WebAuthInterceptor webAuthInterceptor() {
return new WebAuthInterceptor();
}
>>>>>>> 3bc7fe8847766d39bf419c764c9495af3590dfa2
}
src/main/java/com/cnooc/expert/controller/expert/ExpertController.java
......@@ -4,13 +4,16 @@ import com.cnooc.expert.common.response.ApiResult;
import com.cnooc.expert.common.response.BasePageResp;
import com.cnooc.expert.controller.expert.model.request.CompanyPageReq;
import com.cnooc.expert.controller.expert.model.request.DictNofilterListReq;
import com.cnooc.expert.controller.expert.model.request.GeRenXiuJiaPageReq;
import com.cnooc.expert.controller.expert.model.request.PingBiaoXiangMuInfoGetByChouQuMaReq;
import com.cnooc.expert.controller.expert.model.request.PingBiaoXiangMuPageReq;
import com.cnooc.expert.controller.expert.model.request.QingJiaJinJiPageReq;
import com.cnooc.expert.controller.expert.model.response.DictListItemResp;
import com.cnooc.expert.controller.expert.model.response.ExpertInfoGetResp;
import com.cnooc.expert.controller.expert.model.response.GeRenXiuJiaPageResp;
import com.cnooc.expert.controller.expert.model.response.NofilterListItemResp;
import com.cnooc.expert.controller.expert.model.response.PingBiaoXiangMuInfoGetByChouQuMaResp;
import com.cnooc.expert.controller.expert.model.response.PingBiaoZhuanYeTreeNodeResp;
import com.cnooc.expert.controller.expert.model.response.SecondaryUnitListItemResp;
import com.cnooc.expert.service.ExpertService;
import com.fasterxml.jackson.core.JsonProcessingException;
......@@ -91,6 +94,16 @@ public class ExpertController {
}
/**
* 学位列表
*
* @return
*/
@PostMapping("/ping-biao-zhuan-ye/tree")
public ApiResult<List<PingBiaoZhuanYeTreeNodeResp>> PingBiaoZhuanYeTree() {
return ApiResult.successWithResult(expertService.treePingBiaoZhuanYe());
}
/**
* 公司列表
*
* @return
......@@ -127,10 +140,16 @@ public class ExpertController {
}
// *** 请假/休假 ***
// 个人请假
@PostMapping("/qing-jia/jin-ji/page")
// 紧急请假
@PostMapping("/qing-jia/page")
public ApiResult<BasePageResp<Object>> qingJiaJinJiPage(@RequestBody @Validated QingJiaJinJiPageReq req) {
return ApiResult.successWithResult(expertService.pageJinJiQingJia(req));
}
// 个人休假
@PostMapping("/xiu-jia/page")
public ApiResult<BasePageResp<Object>> geRenXiuJiaPage(@RequestBody @Validated GeRenXiuJiaPageReq req) {
return ApiResult.successWithResult(expertService.pageGeRenXiuJia(req));
}
}
src/main/java/com/cnooc/expert/controller/expert/model/request/GeRenXiuJiaPageReq.java 0 → 100644
package com.cnooc.expert.controller.expert.model.request;
import com.cnooc.expert.common.request.BasePageRequest;
import lombok.Data;
import lombok.EqualsAndHashCode;
@EqualsAndHashCode(callSuper = true)
@Data
public class GeRenXiuJiaPageReq extends BasePageRequest {
private String zhuanJiaGuid;
private Long qingJiaStartTime;
private Long qingJiaEndTime;
}
src/main/java/com/cnooc/expert/controller/expert/model/response/GeRenXiuJiaPageResp.java 0 → 100644
package com.cnooc.expert.controller.expert.model.response;
import lombok.Builder;
import lombok.Data;
@Data
@Builder
public class GeRenXiuJiaPageResp {
private Long createTime;
private String createTimeText;
private String creatorName;
private Long endTime;
private String endTimeText;
private Boolean isHaveChanged;
private Boolean isXiTongQj;
private Integer leiXing;
private String modifierName;
private Long modifyTime;
private String modifyTimeText;
private String qingJiaDays;
private String qingJiaEndTime;
private String qingJiaGuid;
private Long qingJiaStartTime;
private String qingJiaYuanYin;
private String remark;
private String shenFenZheng;
private String shenPiTime;
private String shenPiTimeText;
private String shenPiYiJian;
private String shenPiZhuangTai;
private Long startTime;
private String startTimeText;
private Long tiJiaoTime;
private String tiJiaoTimeText;
private Long xiaoJiaTime;
private String xiaoJiaTimeText;
private String zhuanJiaCode;
private String zhuanJiaGuid;
private String zhuanJiaName;
}
src/main/java/com/cnooc/expert/controller/expert/model/response/PingBiaoZhuanYeTreeNodeResp.java 0 → 100644
package com.cnooc.expert.controller.expert.model.response;
import lombok.Builder;
import lombok.Data;
import java.util.List;
@Data
@Builder
public class PingBiaoZhuanYeTreeNodeResp {
private String id;
private String code;
private String name;
private Integer level;
private Integer sort;
private String path;
private List<PingBiaoZhuanYeTreeNodeResp> children;
}
src/main/java/com/cnooc/expert/external/expert/api/LoginServiceApi.java
package com.cnooc.expert.external.expert.api;
<<<<<<< HEAD
import com.cnooc.expert.external.expert.model.request.ExpertInfoGetReq;
import com.cnooc.expert.external.expert.model.response.ExpertInfoGetTestResp;
=======
>>>>>>> 3bc7fe8847766d39bf419c764c9495af3590dfa2
import com.cnooc.expert.external.expert.model.request.ExpertInfoAppReq;
import com.cnooc.expert.external.expert.model.request.ExpertInfoGetReq;
import com.cnooc.expert.external.expert.model.request.ExpertInfoReq;
......@@ -29,5 +34,8 @@ public interface LoginServiceApi {
@POST("/zjfw/zggrxxgl/updateZhuanJiaInfoApp")
Call<ExpertInfoAppResp> updateZhuanJiaInfoApp(@HeaderMap Map<String, Object> headers, @Body ExpertInfoAppReq expertInfoAppReq);
<<<<<<< HEAD
=======
>>>>>>> 3bc7fe8847766d39bf419c764c9495af3590dfa2
}
src/main/java/com/cnooc/expert/service/ExpertService.java
......@@ -3,15 +3,18 @@ package com.cnooc.expert.service;
import com.cnooc.expert.common.response.BasePageResp;
import com.cnooc.expert.controller.expert.model.request.CompanyPageReq;
import com.cnooc.expert.controller.expert.model.request.DictNofilterListReq;
import com.cnooc.expert.controller.expert.model.request.GeRenXiuJiaPageReq;
import com.cnooc.expert.controller.expert.model.request.PingBiaoXiangMuInfoGetByChouQuMaReq;
import com.cnooc.expert.controller.expert.model.request.PingBiaoXiangMuPageReq;
import com.cnooc.expert.controller.expert.model.request.QingJiaJinJiPageReq;
import com.cnooc.expert.controller.expert.model.response.CompanyPageResp;
import com.cnooc.expert.controller.expert.model.response.DictListItemResp;
import com.cnooc.expert.controller.expert.model.response.ExpertInfoGetResp;
import com.cnooc.expert.controller.expert.model.response.GeRenXiuJiaPageResp;
import com.cnooc.expert.controller.expert.model.response.NofilterListItemResp;
import com.cnooc.expert.controller.expert.model.response.PingBiaoXiangMuInfoGetByChouQuMaResp;
import com.cnooc.expert.controller.expert.model.response.PingBiaoXiangMuPageResp;
import com.cnooc.expert.controller.expert.model.response.PingBiaoZhuanYeTreeNodeResp;
import com.cnooc.expert.controller.expert.model.response.QingJiaJinJiPageResp;
import com.cnooc.expert.controller.expert.model.response.SecondaryUnitListItemResp;
import com.cnooc.expert.external.expert.model.request.ExpertInfoGetReq;
......@@ -873,4 +876,100 @@ public class ExpertService {
.data(data)
.build();
}
public List<PingBiaoZhuanYeTreeNodeResp> treePingBiaoZhuanYe() {
List<PingBiaoZhuanYeTreeNodeResp> children3 = Lists.newArrayList(
PingBiaoZhuanYeTreeNodeResp.builder()
.id("c59fd63413a55127ee575af9acebf7f8")
.code("A020102")
.name("铁路")
.level(null)
.sort(null)
.path("$$$A02$$$A0201$$$A020102$$$")
.children(Collections.emptyList())
.build(),
PingBiaoZhuanYeTreeNodeResp.builder()
.id("3e045f75167b06eaaa9332dddca76504")
.code("A020107")
.name("火电")
.level(null)
.sort(null)
.path("$$$A02$$$A0201$$$A020102$$$")
.children(Collections.emptyList())
.build()
);
List<PingBiaoZhuanYeTreeNodeResp> children2 = Lists.newArrayList(
PingBiaoZhuanYeTreeNodeResp.builder()
.id("ee219c9d3163151add3474ba296f55da")
.code("A0201")
.name("投资策划与决策")
.level(null)
.sort(null)
.path("$$$A02$$$A0201$$$")
.children(children3)
.build()
);
List<PingBiaoZhuanYeTreeNodeResp> children1 = Lists.newArrayList(
PingBiaoZhuanYeTreeNodeResp.builder()
.id("2fbccc3477502e9fae23a1f50dee27e2")
.code("A02")
.name("投资策划与决策")
.level(null)
.sort(null)
.path("$$$A02$$$")
.children(children2)
.build()
);
return children1;
}
public BasePageResp<Object> pageGeRenXiuJia(GeRenXiuJiaPageReq req) {
List<Object> data = Lists.newArrayList(
GeRenXiuJiaPageResp.builder()
.createTime(1761198859239L)
.createTimeText("2025-10-23 13:54:19")
.creatorName("物装中心十七")
.endTime(1761408000000L)
.endTimeText("2025-10-26 00:00:00")
.isHaveChanged(false)
.isXiTongQj(false)
.leiXing(1)
.modifierName("物装中心十七")
.modifyTime(1761198867075L)
.modifyTimeText("2025-10-23 13:54:27")
.qingJiaDays("1.0")
.qingJiaEndTime(null)
.qingJiaGuid("05317e7a-5e19-4125-a088-1d5256aa5eed")
.qingJiaStartTime(null)
.qingJiaYuanYin("ceshiyixia")
.remark("")
.shenFenZheng("")
.shenPiTime(null)
.shenPiTimeText("")
.shenPiYiJian("")
.shenPiZhuangTai(null)
.startTime(1761321600000L)
.startTimeText("2025-10-25 00:00:00")
.tiJiaoTime(null)
.tiJiaoTimeText("")
.xiaoJiaTime(1761198867075L)
.xiaoJiaTimeText("2025-10-23 13:54:27")
.zhuanJiaCode("")
.zhuanJiaGuid("3b5def9d-2e98-4f90-9aaa-10aefd28c61b")
.zhuanJiaName("")
.build()
);
return BasePageResp.builder()
.current(1)
.pages(1)
.total(1)
.data(data)
.build();
}
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment