Skip to content

A
amos-boot-biz
Commit effdde1b authored by 韩桐桐's avatar 韩桐桐
Browse files
Options

导出topic改用token + 人员bugfix 29605

parent de895c8a
Expand all Show whitespace changes
Inline Side-by-side
Showing with 56 additions and 39 deletions
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/controller/JgTableDataExportController.java
View file @ effdde1b
......@@ -57,11 +57,11 @@ public class JgTableDataExportController extends BaseController {
@RequestParam(value = "ids", required = false) String ids,
@RequestParam(value = "sort", required = false) String sort) {
String uuid = UUID.randomUUID().toString();
iJgTableDataExportService.startDownLoadMsg("",getSelectedOrgInfo(), uuid);
iJgTableDataExportService.startDownLoadMsg("", uuid);
RequestContextWrapper contextWrapper = RequestContextWrapper.capture();
new Thread(() -> {
contextWrapper.apply();
iJgTableDataExportService.certificate(uuid, getSelectedOrgInfo(), dto, ids == null ? new ArrayList<>() : Arrays.asList(ids.split(",")), sort);
iJgTableDataExportService.certificate(uuid, dto, ids == null ? new ArrayList<>() : Arrays.asList(ids.split(",")), sort);
}).start();
return ResponseHelper.buildResponse("后台处理中，请注意下载！");
}
......@@ -197,10 +197,10 @@ public class JgTableDataExportController extends BaseController {
public ResponseModel<String> unregulatedEquipExport(@RequestParam Map<String, Object> map) {
RequestContextWrapper contextWrapper = RequestContextWrapper.capture();
String uuid = UUID.randomUUID().toString();
iJgTableDataExportService.startDownLoadMsg("未纳管设备列表数据",getSelectedOrgInfo(), uuid);
iJgTableDataExportService.startDownLoadMsg("未纳管设备列表数据", uuid);
new Thread(() -> {
contextWrapper.apply();
iJgTableDataExportService.unregulatedEquip(uuid, getSelectedOrgInfo(), map);
iJgTableDataExportService.unregulatedEquip(uuid, map);
}).start();
return ResponseHelper.buildResponse("后台处理中，请注意下载！");
}
......@@ -210,11 +210,11 @@ public class JgTableDataExportController extends BaseController {
@ApiOperation(httpMethod = "GET", value = "已纳管设备列表数据导出", notes = "已纳管设备列表数据导出")
public ResponseModel<String> manageEquipmentExport(@RequestParam Map<String, Object> map) {
String uuid = UUID.randomUUID().toString();
iJgTableDataExportService.startDownLoadMsg("已纳管设备列表数据",getSelectedOrgInfo(), uuid);
iJgTableDataExportService.startDownLoadMsg("已纳管设备列表数据", uuid);
RequestContextWrapper contextWrapper = RequestContextWrapper.capture();
new Thread(() -> {
contextWrapper.apply();
iJgTableDataExportService.manageEquipment(uuid, getSelectedOrgInfo(), map);
iJgTableDataExportService.manageEquipment(uuid, map);
}).start();
return ResponseHelper.buildResponse("后台处理中，请注意下载！");
}
......@@ -233,7 +233,7 @@ public class JgTableDataExportController extends BaseController {
public ResponseModel<String> unregulatedPipe(@RequestParam Map<String, String> params,
@RequestParam(value = "sort", required = false) String sort) {
String uuid = UUID.randomUUID().toString();
iJgTableDataExportService.startDownLoadMsg("未纳管压力管道列表",getSelectedOrgInfo(), uuid);
iJgTableDataExportService.startDownLoadMsg("未纳管压力管道列表", uuid);
RequestContextWrapper contextWrapper = RequestContextWrapper.capture();
new Thread(() -> {
contextWrapper.apply();
......@@ -248,7 +248,7 @@ public class JgTableDataExportController extends BaseController {
public ResponseModel<String> managePipe(@RequestParam Map<String, String> params,
@RequestParam(value = "sort", required = false) String sort) {
String uuid = UUID.randomUUID().toString();
iJgTableDataExportService.startDownLoadMsg("已纳管压力管道列表",getSelectedOrgInfo(), uuid);
iJgTableDataExportService.startDownLoadMsg("已纳管压力管道列表", uuid);
RequestContextWrapper contextWrapper = RequestContextWrapper.capture();
new Thread(() -> {
contextWrapper.apply();
......@@ -262,11 +262,11 @@ public class JgTableDataExportController extends BaseController {
@ApiOperation(httpMethod = "GET", value = "基础设置-企业信息列表数据导出", notes = "基础设置-企业信息列表数据导出")
public ResponseModel<String> managePipe(String ids, TzBaseEnterpriseInfoDto tzBaseEnterpriseInfoDto) {
String uuid = UUID.randomUUID().toString();
iJgTableDataExportService.startDownLoadMsg("企业信息列表",getSelectedOrgInfo(), uuid);
iJgTableDataExportService.startDownLoadMsg("企业信息列表", uuid);
RequestContextWrapper contextWrapper = RequestContextWrapper.capture();
new Thread(() -> {
contextWrapper.apply();
iJgTableDataExportService.enterpriseInformationExport(uuid, ids, tzBaseEnterpriseInfoDto, getSelectedOrgInfo());
iJgTableDataExportService.enterpriseInformationExport(uuid, ids, tzBaseEnterpriseInfoDto);
}).start();
return ResponseHelper.buildResponse("后台处理中，请注意下载！");
}
......@@ -278,11 +278,11 @@ public class JgTableDataExportController extends BaseController {
@RequestParam(value = "sort", required = false) String sort,
@RequestParam Map<String, String> map) {
String uuid = UUID.randomUUID().toString();
iJgTableDataExportService.startDownLoadMsg("人员信息列表",getSelectedOrgInfo(), uuid);
iJgTableDataExportService.startDownLoadMsg("人员信息列表", uuid);
RequestContextWrapper contextWrapper = RequestContextWrapper.capture();
new Thread(() -> {
contextWrapper.apply();
iJgTableDataExportService.userInfoExport(uuid, ids, map, getSelectedOrgInfo());
iJgTableDataExportService.userInfoExport(uuid, ids, map);
}).start();
return ResponseHelper.buildResponse("后台处理中，请注意下载！");
}
......@@ -291,13 +291,13 @@ public class JgTableDataExportController extends BaseController {
@PostMapping(value = "/userInfoExportWithAdmin")
@ApiOperation(httpMethod = "POST", value = "基础设置-监管单位-人员信息列表数据导出", notes = "基础设置-监管单位-人员信息列表数据导出")
public ResponseModel<String> userInfoExportWithAdmin(@RequestParam(value = "ids", required = false) String ids,
@RequestBody Map<String,String> map) {
@RequestBody Map<String, String> map) {
String uuid = UUID.randomUUID().toString();
iJgTableDataExportService.startDownLoadMsg("人员信息列表",getSelectedOrgInfo(), uuid);
iJgTableDataExportService.startDownLoadMsg("人员信息列表", uuid);
RequestContextWrapper contextWrapper = RequestContextWrapper.capture();
new Thread(() -> {
contextWrapper.apply();
iJgTableDataExportService.userInfoExportWithAdmin(uuid, ids, map, getSelectedOrgInfo());
iJgTableDataExportService.userInfoExportWithAdmin(uuid, ids, map);
}).start();
return ResponseHelper.buildResponse("后台处理中，请注意下载！");
}
......
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/IJgTableDataExportService.java
View file @ effdde1b
......@@ -15,11 +15,11 @@ import java.util.Map;
*/
public interface IJgTableDataExportService {
void startDownLoadMsg(String fileName, ReginParams reginParams, String uuid);
void startDownLoadMsg(String fileName, String uuid);
void gen(String jsonName, String voName, String tableName);
void certificate(String uuid, ReginParams reginParams, JgUseRegistrationManageDto dto, List<String> ids, String sort);
void certificate(String uuid, JgUseRegistrationManageDto dto, List<String> ids, String sort);
void maintenance(HttpServletResponse response, List<String> ids);
......@@ -49,9 +49,9 @@ public interface IJgTableDataExportService {
void changeVehicleRegistrationUnit(HttpServletResponse response, List<String> ids);
void unregulatedEquip(String uuid, ReginParams reginParams, Map<String, Object> map);
void unregulatedEquip(String uuid, Map<String, Object> map);
void manageEquipment(String uuid, ReginParams reginParams, Map<String, Object> map);
void manageEquipment(String uuid, Map<String, Object> map);
void equipTransfer(HttpServletResponse response, List<String> ids);
......@@ -59,9 +59,9 @@ public interface IJgTableDataExportService {
void unregulatedPipe(String uuid, Map<String, String> params, String sort, ReginParams reginParams);
void enterpriseInformationExport(String uuid, String ids, TzBaseEnterpriseInfoDto tzBaseEnterpriseInfoDto, ReginParams reginParams);
void enterpriseInformationExport(String uuid, String ids, TzBaseEnterpriseInfoDto tzBaseEnterpriseInfoDto);
void userInfoExport(String uuid, String ids, Map<String, String> map, ReginParams reginParams);
void userInfoExport(String uuid, String ids, Map<String, String> map);
void userInfoExportWithAdmin(String uuid, String ids, Map<String, String> map, ReginParams reginParams);
void userInfoExportWithAdmin(String uuid, String ids, Map<String, String> map);
}
amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-api/src/main/java/com/yeejoin/amos/boot/module/tcm/api/service/ITzsUserInfoService.java
View file @ effdde1b
......@@ -29,9 +29,10 @@ public interface ITzsUserInfoService extends IService<TzsUserInfo> {
void deleteBatch(Object[] ids);
Map<String, Object> getDetail(Long id);
Map<String, Object> getDetail(Long id, ReginParams reginParams);
boolean BindAccount(Map<String, Object> map);
String startOrStopAccount(Map<String, Object> map);
List<Map<String, Object>> getEquipmentType(String creditCode);
......@@ -46,21 +47,21 @@ public interface ITzsUserInfoService extends IService<TzsUserInfo> {
JSONObject statisticsOfPersonnelTypesByPatentCode(String parentId);
Map<String,Integer> getArrangementStatistic(String companyCode);
Map<String, Integer> getArrangementStatistic(String companyCode);
Map<String,Object> getCompanyType();
Map<String, Object> getCompanyType();
Map<String,Object> getCompanyTypeForRedis(ReginParams selectedOrgInfo);
Map<String, Object> getCompanyTypeForRedis(ReginParams selectedOrgInfo);
Page<TzsEquipListDto> getEquipList(String type,String userSeq,TzsEquipListDto dto, Page<TzsEquipListDto> page);
Page<TzsEquipListDto> getEquipList(String type, String userSeq, TzsEquipListDto dto, Page<TzsEquipListDto> page);
Boolean equipBind(String type, String userSeq, String creditCode, Map<String,Object> map);
Boolean equipBind(String type, String userSeq, String creditCode, Map<String, Object> map);
List<TzsUserInfo> getSafetyList(String companyCode);
List<Map<String,Object>> getGroupList();
List<Map<String, Object>> getGroupList();
Map<String,Object> getPersonType();
Map<String, Object> getPersonType();
List<GroupAndPersonInfoDto> getGroupAndPersonInfo(Long groupId);
......@@ -78,6 +79,7 @@ public interface ITzsUserInfoService extends IService<TzsUserInfo> {
/**
* 批量导入人员
*
* @param file 导入的文件
* @return 失败时返回失败信息，提供时返回success
*/
......
amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-biz/src/main/java/com/yeejoin/amos/boot/module/tcm/biz/controller/TzsUserInfoController.java
View file @ effdde1b
......@@ -113,7 +113,7 @@ public class TzsUserInfoController extends BaseController {
@GetMapping(value = "/getDetail")
@ApiOperation(httpMethod = "GET", value = "详情", notes = "详情")
public ResponseModel<Map<String, Object>> queryForPage(@RequestParam(value = "id") Long id) {
return ResponseHelper.buildResponse(tzsUserInfoService.getDetail(id));
return ResponseHelper.buildResponse(tzsUserInfoService.getDetail(id, getSelectedOrgInfo()));
}
@TycloudOperation(ApiLevel = UserType.AGENCY)
......@@ -312,11 +312,11 @@ public class TzsUserInfoController extends BaseController {
@RequestParam(value = "size") long size,
@RequestParam(value = "sort", required = false) String sort,
@RequestParam(required = false, defaultValue = "all") String type,
@RequestBody Map<String,String> map) {
@RequestBody Map<String, String> map) {
UserPermissionDto filter = JSON.parseObject(JSON.toJSONString(map), UserPermissionDto.class);
filter.setOrgCode(getSelectedOrgInfo().getCompany().getOrgCode());
filter.setCityCode(getSelectedOrgInfo().getCompany().getCompanyCode());
Page<UserPermissionDto> userPermissionDtos = tzsUserInfoServiceImpl.getUserByPermission(current, size, type, filter,sort);
Page<UserPermissionDto> userPermissionDtos = tzsUserInfoServiceImpl.getUserByPermission(current, size, type, filter, sort);
return ResponseHelper.buildResponse(userPermissionDtos);
}
......@@ -350,7 +350,7 @@ public class TzsUserInfoController extends BaseController {
@GetMapping(value = "/export")
@ApiOperation(httpMethod = "GET", value = "人员管理列表数据导出", notes = "人员管理列表数据导出")
public void userInfoExport(HttpServletResponse response, String ids) {
Assert.hasText(ids,"未选择导出数据");
Assert.hasText(ids, "未选择导出数据");
tzsUserInfoService.userInfoExport(response, Arrays.asList(ids.split(",")));
}
......@@ -369,7 +369,7 @@ public class TzsUserInfoController extends BaseController {
@TycloudOperation(ApiLevel = UserType.AGENCY)
@PostMapping(value = "/import")
@ApiOperation(value = "人员导入",httpMethod = "POST",notes = "导入已经存在公司的人员")
@ApiOperation(value = "人员导入", httpMethod = "POST", notes = "导入已经存在公司的人员")
public ResponseModel<?> importUser(@RequestBody MultipartFile file) {
return tzsUserInfoService.importUserBatch(file);
}
......@@ -398,7 +398,7 @@ public class TzsUserInfoController extends BaseController {
@TycloudOperation(ApiLevel = UserType.AGENCY)
@GetMapping(value = "/getJobItemBySubPost")
@ApiOperation(httpMethod = "GET", value = "根据人员子类型查询作业项目", notes = "根据人员子类型查询作业项目")
public ResponseModel<List<DictionarieValueModel> > getJobItemBySubPost(@RequestParam(value = "dicKey") String dicKey,
public ResponseModel<List<DictionarieValueModel>> getJobItemBySubPost(@RequestParam(value = "dicKey") String dicKey,
@RequestParam(value = "") String subPost) {
List<DictionarieValueModel> result = Systemctl.dictionarieClient.dictValues(dicKey).getResult();
// 包含 持证人员（P）6764 或 持证人员（R2）6765 并且不包含持证人员 6713 的情况下 只显示【移动式压力容器充装】和【气瓶充装】
......
amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-biz/src/main/java/com/yeejoin/amos/boot/module/tcm/biz/service/impl/TzsUserInfoServiceImpl.java
View file @ effdde1b
......@@ -317,7 +317,11 @@ public class TzsUserInfoServiceImpl extends BaseService<TzsUserInfoDto, TzsUserI
}
@Override
public Map<String, Object> getDetail(Long id) {
public Map<String, Object> getDetail(Long id, ReginParams reginParams) {
// 为了处理以下场景
// 1：没有单位限制的时候添加了所有类型的人员，现在有了单位类型限制的情况下更新不了原先人员
// 2：多种单位类型的企业编辑另一种单位类型下的人员
List<String> unitTypeAllPostCode = this.postByUnitType(reginParams.getCompany()).stream().map(DataDictionary::getCode).collect(Collectors.toList());
Map<String, Object> maps = new HashMap<>();
TzsUserInfo tzsUserInfo = tzsUserInfoMapper.selectById(id);
TzsUserInfoVo tzsUserInfoVo = new TzsUserInfoVo();
......@@ -326,8 +330,13 @@ public class TzsUserInfoServiceImpl extends BaseService<TzsUserInfoDto, TzsUserI
tzsUserInfoVo.setPost(JSON.parseArray(tzsUserInfo.getPost()));
}
Optional.ofNullable(tzsUserInfo.getNewPost())
.filter(post -> !ObjectUtils.isEmpty(post))
.map(JSON::parseArray)
.map(array -> array.stream()
.map(String::valueOf)
.filter(unitTypeAllPostCode::contains)
.collect(Collectors.toList()))
.filter(list -> !list.isEmpty())
.map(item -> JSONArray.parseArray(JSON.toJSONString(item)))
.ifPresent(tzsUserInfoVo::setNewPost);
Optional.ofNullable(tzsUserInfo.getSubPost())
.filter(post -> !ObjectUtils.isEmpty(post))
......@@ -1686,7 +1695,12 @@ public class TzsUserInfoServiceImpl extends BaseService<TzsUserInfoDto, TzsUserI
@Override
public List<DataDictionary> postByUnitType(CompanyBo company) {
ArrayList<String> postDictCodeList = new ArrayList<>();
JsonNode companyTypeNode = postData.get(company.getCompanyType());
TzBaseEnterpriseInfo enterpriseInfo = baseEnterpriseInfoService.lambdaQuery()
.eq(TzBaseEnterpriseInfo::getUseCode, company.getCompanyCode())
.one();
List<String> unitTypes = Arrays.asList(enterpriseInfo.getUnitType().split("#"));
unitTypes.forEach(unitType -> {
JsonNode companyTypeNode = postData.get(unitType);
if (companyTypeNode != null && companyTypeNode.isObject()) {
Iterator<Map.Entry<String, JsonNode>> fields = companyTypeNode.fields();
while (fields.hasNext()) {
......@@ -1695,6 +1709,7 @@ public class TzsUserInfoServiceImpl extends BaseService<TzsUserInfoDto, TzsUserI
postDictCodeList.add(postCode); // 主岗位
}
}
});
return this.getAllUserType().stream()
.filter(item -> postDictCodeList.contains(item.getCode()))
.collect(Collectors.toList());
......
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