FT/foton-slrs-system-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop_master' into develop_master

Browse Source
This commit is contained in:
yuezhihang
2022-01-21 14:48:10 +08:00
parent 5f9f162535 1d1beb5b89
commit 278e6d05bb
10 changed files with 51 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-jwtLogin/src/main/java/com/adc/da/login/rest/LoginRestController.java
+5
View File
@@ -29,6 +29,7 @@ import javax.servlet.http.HttpServletResponse;
import javax.validation.constraints.NotNull;
import java.io.UnsupportedEncodingException;
import java.net.URLEncoder;
import java.util.List;
@Validated
@@ -96,6 +97,10 @@ public class LoginRestController {
if(userEO.getDisableFlag()==1){
return Result.error("r0011", "帐号已禁用");
}
String position = userService.selectPositionByUserId(account);
if(StringUtils.isBlank(position)){
return Result.error("r0011", "无配置岗位");
}
String token = jwtUtils.generateToken(userEO.getUsid());
userEO.setToken(token);
// 加密重要信息
adc-da-slrs/src/main/java/com/adc/da/slrs/customWorkGroup/controller/WorkGroupController.java
+1 -1
View File
@@ -57,7 +57,7 @@ public class WorkGroupController extends BaseController<WorkGroup> {
@ApiModelProperty("删除工作组")
@ApiModelProperty("批量删除工作组")
@DeleteMapping
public ResponseMessage deleteWorkGroup(String id){
boolean delete = iWorkGroupService.delete(id);
adc-da-slrs/src/main/java/com/adc/da/slrs/customWorkGroup/service/impl/WorkGroupServiceImpl.java
+5 -1
View File
@@ -12,6 +12,9 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.Arrays;
import java.util.List;
/**
* <p>
* 服务实现类
@@ -36,7 +39,8 @@ public class WorkGroupServiceImpl extends ServiceImpl<WorkGroupDao, WorkGroup> i
@Override
public boolean delete(String workGroupId) {
return this.removeById(workGroupId);
List<String> idList = Arrays.asList(workGroupId.split(","));
return this.removeByIds(idList);
}
@Override
adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/entity/SarBussionessStand.java
+3
View File
@@ -153,6 +153,9 @@ public class SarBussionessStand extends BaseEntity {
@TableField(exist = false)
private String menuParentId;
@TableField(exist = false)
private String textStatusBussShow;
@TableField(exist = false)
private String standStatusShow; // 标准状态下拉框 --单选
adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/impl/SarStandProjectLibraryServiceImpl.java
+17 -19
View File
@@ -79,32 +79,30 @@ public class SarStandProjectLibraryServiceImpl extends ServiceImpl<SarStandProje
//把刚刚拿到的值存到实体类里
SarStandProjectLibrary projectInfo = new SarStandProjectLibrary();
projectInfo
.setProjectPlatfor(projectObject.get("eng_platform").getAsString())
.setProjectNumber(projectObject.get("code").getAsString())
.setProjectName(projectObject.get("name").getAsString())
.setProjectClassification(projectObject.get("catalog_name").getAsString())
.setProjectStatus(projectObject.get("project_status_name").getAsString())
.setProjectGroup(projectObject.get("project_group_name").getAsString())
.setCurrentNode(projectObject.get("project_current_milestone").getAsString())
.setProjectLevel(projectObject.get("project_level").getAsString())
.setProductLine(projectObject.get("eng_product_line").getAsString())
.setManagementHostName(projectObject.get("management_host_name").getAsString())
.setDevelopmentHostName(projectObject.get("development_host_name").getAsString())
.setCategoryName(projectObject.get("category_name").getAsString());
.setProjectPlatfor(projectObject.get("eng_platform")==null?"":projectObject.get("eng_platform").getAsString())
.setProjectNumber(projectObject.get("code")==null?"":projectObject.get("code").getAsString())
.setProjectName(projectObject.get("name")==null?"":projectObject.get("name").getAsString())
.setProjectClassification(projectObject.get("catalog_name")==null?"":projectObject.get("catalog_name").getAsString())
.setProjectStatus(projectObject.get("project_status_name")==null?"":projectObject.get("project_status_name").getAsString())
.setProjectGroup(projectObject.get("project_group_name")==null?"":projectObject.get("project_group_name").getAsString())
.setCurrentNode(projectObject.get("project_current_milestone")==null?"":projectObject.get("project_current_milestone").getAsString())
.setProjectLevel(projectObject.get("project_level")==null?"":projectObject.get("project_level").getAsString())
.setProductLine(projectObject.get("eng_product_line")==null?"":projectObject.get("eng_product_line").getAsString())
.setManagementHostName(projectObject.get("management_host_name")==null?"":projectObject.get("management_host_name").getAsString())
.setDevelopmentHostName(projectObject.get("development_host_name")==null?"":projectObject.get("development_host_name").getAsString())
.setCategoryName(projectObject.get("category_name")==null?"":projectObject.get("category_name").getAsString());
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
try {
if(projectObject.get("target_begin_on") != null){
Date targetBeginOn = simpleDateFormat.parse(projectObject.get("target_begin_on").getAsString());
projectInfo
.setProjectStartDate(targetBeginOn);
}
if(projectObject.get("target_end_on") != null){
Date targetEndOn = simpleDateFormat.parse(projectObject.get("target_end_on").getAsString());
projectInfo
.setProjectStartDate(targetBeginOn)
.setProjectEndDate(targetEndOn);
} catch (ParseException e) {
e.printStackTrace();
}
adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStand/SarBussionessStandMapper.xml
+3 -1
View File
@@ -21,6 +21,7 @@
<result column="stand_sort" property="standSort" />
<result column="stand_year" property="standYear" />
<result column="text_status_buss" property="textStatusBuss" />
<result column="text_status_buss_show" property="textStatusBussShow"/>
</resultMap>
<resultMap id="BaseResultMapExcel" type="com.adc.da.slrs.sarBussionessStand.entity.SarBussionessStand" >
@@ -748,12 +749,13 @@
<!-- 根据id查询 SAR_BUSSIONESS_STAND 的详细信息-->
<select id="selectStandardsInfoByKey" resultMap="BaseResultMap" parameterType="java.lang.String">
select <include refid="Base_Column_List_show" />
select <include refid="Base_Column_List_show" />,dictextstatus.DIC_TYPE_NAME as text_status_buss_show
from SAR_BUSSIONESS_STAND
left join TS_DICTYPE dicstandStatus ON ( dicstandStatus.dic_type_code = SAR_BUSSIONESS_STAND.TEXT_STATUS_BUSS AND dicstandStatus.dic_id IS NOT NULL and dicstandStatus.valid_flag = 0)
left join TS_DICTYPE dicstandNature ON ( dicstandNature.dic_type_code = SAR_BUSSIONESS_STAND.STAND_NATURE AND dicstandNature.dic_id IS NOT NULL and dicstandNature.valid_flag = 0)
left join TS_DICTYPE dicstandSort ON ( dicstandSort.dic_type_code = SAR_BUSSIONESS_STAND.STAND_SORT AND dicstandSort.dic_id IS NOT NULL and dicstandSort.valid_flag = 0)
left join TS_DICTYPE dicapplyCountry ON ( dicapplyCountry.dic_type_code = SAR_BUSSIONESS_STAND.APPLY_COUNTRY AND dicapplyCountry.dic_id IS NOT NULL and dicapplyCountry.valid_flag = 0)
left join TS_DICTYPE dictextstatus ON ( dictextstatus.dic_type_code = SAR_BUSSIONESS_STAND.TEXT_STATUS_BUSS AND dicstandSort.dic_id IS NOT NULL and dictextstatus.valid_flag = 0)
left join SAR_BUSS_STAND_MENU ON SAR_BUSSIONESS_STAND.id = SAR_BUSS_STAND_MENU.buss_stand_id
left join TS_RESOURCE on SAR_BUSS_STAND_MENU.menu_id = TS_RESOURCE.id
where SAR_BUSSIONESS_STAND.id = #{id}
adc-da-sys/src/main/java/com/adc/da/sys/dao/UserEODao.java
+2
View File
@@ -129,6 +129,8 @@ public interface UserEODao extends BaseMapper<UserEO> {
String selectOrgByUserId(String userId);
String selectPositionByUserId(String userId);
List<UserEO> queryUserEoList(UserEOPage page);
/***
* 添加SSO来源用户
adc-da-sys/src/main/java/com/adc/da/sys/service/IUserEOService.java
+2
View File
@@ -55,6 +55,8 @@ public interface IUserEOService extends IService<UserEO> {
public List<String> selectThatOrgUser(String userId);
String selectPositionByUserId(String userId);
public List<UserEO> queryUserEoList(UserEOPage page);
public List<UserEO> queryUserInfoByWordNum(String workNum);
adc-da-sys/src/main/java/com/adc/da/sys/service/impl/UserEOServiceImpl.java
+5
View File
@@ -394,6 +394,11 @@ public class UserEOServiceImpl extends ServiceImpl<UserEODao, UserEO> implements
return userIdList;
}
@Override
public String selectPositionByUserId(String userId) {
return baseMapper.selectPositionByUserId(userId);
}
public List<UserEO> queryUserEoList(UserEOPage page) {
page.setValidFlag("0");
adc-da-sys/src/main/resources/mybatis/mapper/sys/UserEOMapper.xml
+8
View File
@@ -639,6 +639,14 @@
FROM TS_USER_ORG tuo
WHERE tuo.USER_ID = #{userId}
</select>
<select id="selectPositionByUserId" resultType="java.lang.String"
parameterType="java.lang.String">
SELECT position_id
FROM ts_user_position tuo
WHERE tuo.USER_ID = #{userId}
limit 1
</select>
<!--syt:查询所有用户信息-->
<select id="queryUserEoList" resultMap="BaseResultMap" parameterType="com.adc.da.sys.page.UserEOPage">
SELECT