Skip to content

A
amos-boot-biz
Commit 5245ac50 authored by lisong's avatar lisong
Browse files
Options

两员配备需求修改

parent fd724fd3
Show whitespace changes
Inline Side-by-side
Showing with 149 additions and 34 deletions
amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-api/src/main/java/com/yeejoin/amos/boot/module/tcm/api/dto/TzsUserInfoDto.java
View file @ 5245ac50
......@@ -76,4 +76,11 @@ public class TzsUserInfoDto extends BaseDto {
@ApiModelProperty(value = "平台账号锁定状态")
private String lockStatus;
@ApiModelProperty(value = "设备类型")
private String equipType;
@ApiModelProperty(value = "设备绑定状态")
private String state;
}
amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-api/src/main/java/com/yeejoin/amos/boot/module/tcm/api/entity/TzsUserInfo.java
View file @ 5245ac50
package com.yeejoin.amos.boot.module.tcm.api.entity;
import com.baomidou.mybatisplus.annotation.FieldStrategy;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
......@@ -137,4 +138,10 @@ public class TzsUserInfo extends BaseEntity {
*/
@TableField("lock_status")
private String lockStatus;
/**
* 设备类型
*/
@TableField(value = "equip_type", updateStrategy = FieldStrategy.IGNORED)
private String equipType;
}
amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-api/src/main/java/com/yeejoin/amos/boot/module/tcm/api/mapper/TzsUserInfoMapper.java
View file @ 5245ac50
......@@ -8,11 +8,14 @@ import com.yeejoin.amos.boot.module.tcm.api.entity.TzsUserInfo;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.util.List;
import java.util.Map;
public interface TzsUserInfoMapper extends BaseMapper<TzsUserInfo> {
Page<TzsUserInfoDto> selectPageMessage(@Param("page") Page<TzsUserInfoDto> page, @Param("dto") TzsUserInfoDto dto);
List<Map<String, Object>> getUserType(@Param("unitType")String unitType);
Map<String, Integer> getArrangementStatistic(String companyCode);
Page<TzsEquipListDto> getAllEquipList(@Param("page") Page<TzsEquipListDto> page,
......
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 @ 5245ac50
......@@ -28,11 +28,13 @@ public interface ITzsUserInfoService extends IService<TzsUserInfo> {
List<Map<String, Object>> getEquipmentType(String creditCode);
List<Map<String, Object>> getUserType(String unitType);
Map<String,Integer> getArrangementStatistic(String companyCode);
Map<String,Object> getCompanyType();
Page<TzsEquipListDto> getEquipList(String type,String userSeq,TzsEquipListDto dto, Page<TzsEquipListDto> page);
Boolean equipBind(String type, String userSeq, Map<String,Object> map);
Boolean equipBind(String type, String userSeq, String creditCode, Map<String,Object> map);
}
amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-api/src/main/java/com/yeejoin/amos/boot/module/tcm/api/vo/TzsUserInfoVo.java
View file @ 5245ac50
......@@ -2,6 +2,7 @@ package com.yeejoin.amos.boot.module.tcm.api.vo;
import com.alibaba.fastjson.JSONArray;
import com.baomidou.mybatisplus.annotation.TableField;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.Date;
......@@ -114,4 +115,10 @@ public class TzsUserInfoVo {
*/
@TableField("lock_status")
private String lockStatus;
/**
* 设备类型
*/
@ApiModelProperty(value = "设备类型")
private JSONArray equipType;
}
amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-api/src/main/resources/mapper/TzsUserInfoMapper.xml
View file @ 5245ac50
......@@ -21,7 +21,9 @@
CASE
WHEN gender = 1 THEN
'男' ELSE '女'
END AS gender
END AS gender,
unit_code,
case when (SELECT count(1) from tzs_user_equip WHERE user_seq = sequence_nbr )>0 then '是' else '否' END as state
FROM
tzs_user_info
<where>
......@@ -46,7 +48,13 @@
and amos_user_name like concat('%',#{dto.amosUserName},'%')
</if>
<if test="dto.postName != '' and dto.postName != null">
and post_name like concat('%',#{dto.postName},'%')
and post like concat('%',#{dto.postName},'%')
</if>
<if test="dto.state != null and dto.state == 1 ">
and sequence_nbr in (SELECT DISTINCT(user_seq) from tzs_user_equip)
</if>
<if test="dto.state != null and dto.state == 0 ">
and sequence_nbr not in (SELECT DISTINCT(user_seq) from tzs_user_equip)
</if>
</where>
order by rec_date desc
......@@ -128,4 +136,15 @@
AND ibjui."SEQUENCE_NBR" NOT IN (SELECT DISTINCT equip_id FROM tzs_user_equip WHERE credit_code = #{companyCode} )
</if>
</select>
<select id="getUserType" resultType="java.util.Map">
SELECT * FROM "cb_data_dictionary"
WHERE
<if test="unitType != null and unitType != ''">
type = 'QYRYGW' or type = #{unitType}
</if>
<if test="unitType == null or unitType == ''">
type like concat('QYRYGW','%')
</if>
</select>
</mapper>
\ No newline at end of file
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 @ 5245ac50
......@@ -20,6 +20,7 @@ import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
import com.yeejoin.amos.feign.privilege.model.CompanyModel;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.checkerframework.checker.units.qual.A;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.ObjectUtils;
import org.springframework.web.bind.annotation.*;
......@@ -65,14 +66,14 @@ public class TzsUserInfoController extends BaseController {
tzsUserInfo.setUnitName(companyModel.getCompanyName());
tzsUserInfo.setUnitCode(companyModel.getCompanyCode());
tzsUserInfo.setRecDate(new Date());
Map<String, Object> qualificationsInfo = (Map<String, Object>)map.get("qualificationsInfo");
Object subForm = qualificationsInfo.get("subForm");
List<TzsUserQualifications> list = JSON.parseArray(JSON.toJSONString(subForm), TzsUserQualifications.class);
// Map<String, Object> qualificationsInfo = (Map<String, Object>)map.get("qualificationsInfo");
// Object subForm = qualificationsInfo.get("subForm");
// List<TzsUserQualifications> list = JSON.parseArray(JSON.toJSONString(subForm), TzsUserQualifications.class);
tzsUserInfo.setPostName(tzsUserInfoServiceImpl.setPostName(tzsUserInfo.getPost()));
tzsUserInfo = tzsUserInfoServiceImpl.createWithModel(tzsUserInfo);
if (!ObjectUtils.isEmpty(list)){
tzsUserInfoService.addQualificationsMessage(String.valueOf(tzsUserInfo.getSequenceNbr()),list);
}
// if (!ObjectUtils.isEmpty(list)){
// tzsUserInfoService.addQualificationsMessage(String.valueOf(tzsUserInfo.getSequenceNbr()),list);
// }
return ResponseHelper.buildResponse(tzsUserInfo);
}
......@@ -94,16 +95,16 @@ public class TzsUserInfoController extends BaseController {
}
tzsUserInfo.setUnitName(companyModel.getCompanyName());
tzsUserInfo.setUnitCode(companyModel.getCompanyCode());
Map<String, Object> qualificationsInfo = (Map<String, Object>)map.get("qualificationsInfo");
Object subForm = qualificationsInfo.get("subForm");
List<TzsUserQualifications> list = JSON.parseArray(JSON.toJSONString(subForm), TzsUserQualifications.class);
// Map<String, Object> qualificationsInfo = (Map<String, Object>)map.get("qualificationsInfo");
// Object subForm = qualificationsInfo.get("subForm");
// List<TzsUserQualifications> list = JSON.parseArray(JSON.toJSONString(subForm), TzsUserQualifications.class);
tzsUserInfo.setSequenceNbr(rowId);
tzsUserInfo.setRecDate(new Date());
tzsUserInfo.setPostName(tzsUserInfoServiceImpl.setPostName(tzsUserInfo.getPost()));
tzsUserInfoServiceImpl.updateById(tzsUserInfo);
if (!ObjectUtils.isEmpty(list)){
tzsUserInfoService.updateQualificationsMessage(String.valueOf(tzsUserInfo.getSequenceNbr()),list);
}
// if (!ObjectUtils.isEmpty(list)){
// tzsUserInfoService.updateQualificationsMessage(String.valueOf(tzsUserInfo.getSequenceNbr()),list);
// }
return ResponseHelper.buildResponse(tzsUserInfo);
}
......@@ -191,10 +192,17 @@ public class TzsUserInfoController extends BaseController {
}
@TycloudOperation(ApiLevel = UserType.AGENCY)
@GetMapping(value = "/getUserType")
@ApiOperation(httpMethod = "GET", value = "根据单位类型获取人员类型", notes = "根据单位类型获取人员类型")
public ResponseModel<List<Map<String, Object>>> getUserType(@RequestParam(value = "unitType") String unitType) {
return ResponseHelper.buildResponse(tzsUserInfoService.getUserType(unitType));
}
@TycloudOperation(ApiLevel = UserType.AGENCY)
@GetMapping(value = "/getEquipList")
@ApiOperation(httpMethod = "GET", value = "设备查询（可绑定、可解绑）", notes = "设备查询（可绑定、可解绑）")
public ResponseModel<IPage<TzsEquipListDto>> getEquipList(@RequestParam(value = "type") String type,
@RequestParam(value = "userSeq") String userSeq,
@RequestParam(value = "userSeq",required = false) String userSeq,
@RequestParam(value = "current") String current,
@RequestParam(value = "size") String size,
TzsEquipListDto dto) {
......@@ -207,11 +215,12 @@ public class TzsUserInfoController extends BaseController {
@TycloudOperation(ApiLevel = UserType.AGENCY)
@GetMapping(value = "/equipBind")
@PostMapping(value = "/equipBind")
@ApiOperation(httpMethod = "POST", value = "设备绑定解绑", notes = "设备绑定解绑")
public ResponseModel<Boolean> equipBind(@RequestParam(value = "type") String type,
@RequestParam(value = "userSeq") String userSeq,
@RequestParam(value = "creditCode") String creditCode,
@RequestBody Map<String,Object> map) {
return ResponseHelper.buildResponse(tzsUserInfoService.equipBind(type, userSeq, map));
return ResponseHelper.buildResponse(tzsUserInfoService.equipBind(type, userSeq, creditCode, map));
}
}
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/TzBaseEnterpriseInfoServiceImpl.java
View file @ 5245ac50
......@@ -2,6 +2,7 @@ package com.yeejoin.amos.boot.module.tcm.biz.service.impl;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson.TypeReference;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
......@@ -15,7 +16,9 @@ import com.yeejoin.amos.boot.module.tcm.api.dto.BaseUnitLicenceDto;
import com.yeejoin.amos.boot.module.tcm.api.dto.EquEnterDto;
import com.yeejoin.amos.boot.module.tcm.api.dto.TzBaseEnterpriseInfoDto;
import com.yeejoin.amos.boot.module.tcm.api.entity.*;
import com.yeejoin.amos.boot.module.tcm.api.enums.EquipmentClassifityEnum;
import com.yeejoin.amos.boot.module.tcm.api.mapper.TzBaseEnterpriseInfoMapper;
import com.yeejoin.amos.boot.module.tcm.api.mapper.TzsUserInfoMapper;
import com.yeejoin.amos.boot.module.tcm.api.service.IBaseUnitLicenceService;
import com.yeejoin.amos.boot.module.tcm.api.service.ITzBaseEnterpriseInfoService;
import com.yeejoin.amos.boot.module.tcm.biz.utils.RedisUtil;
......@@ -94,6 +97,9 @@ public class TzBaseEnterpriseInfoServiceImpl
@Autowired
TzsBaseInstitutionServiceImpl tzsBaseInstitutionService;
@Autowired
private TzsUserInfoMapper tzsUserInfoMapper;
/**
* 企业管理员变更缓存key前缀
*/
......@@ -473,11 +479,16 @@ public class TzBaseEnterpriseInfoServiceImpl
// //修改许可信息
// List<BaseUnitLicence> licences = (List<BaseUnitLicence>) map.get("unitLicences");
// baseUnitLicenceService.saveOrUpdateBatch(licences);
// 企业信息变更-同步修改企业下人员绑定设备类型
ArrayList<String> newData = new ArrayList<>();
JSONArray objects = JSON.parseArray(tzBaseEnterpriseInfo.getEquipCategory());
objects.forEach(item ->{
newData.add(item.toString());
});
boolean b = tzBaseEnterpriseInfoService.updateById(tzBaseEnterpriseInfo);
if (b) {
try {
CompanyModel updateModel = Privilege.companyClient.queryByCompanyCode(String.valueOf(map.get("useUnitCode"))).getResult();
CompanyModel updateModel = Privilege.companyClient.queryByCompanyCode(String.valueOf(map.get("useCode"))).getResult();
HashMap<String, Object> parentMessage = (HashMap<String, Object>) Privilege.companyClient.queryByOrgcode(String.valueOf(map.get("superviseOrgCode"))).getResult();
// 目前平台返回key为compnay(存在拼写错误)
CompanyModel parentModel = JSON.parseObject(JSON.toJSONString(parentMessage.get("compnay")), CompanyModel.class);
......@@ -486,6 +497,7 @@ public class TzBaseEnterpriseInfoServiceImpl
} catch (Exception e) {
throw new BadRequest("操作失败！");
}
updateUserInfo(newData, String.valueOf(map.get("useCode")));
TzBaseEnterpriseInfoDto tzBaseEnterpriseInfoDto = new TzBaseEnterpriseInfoDto();
BeanUtils.copyProperties(tzBaseEnterpriseInfo, tzBaseEnterpriseInfoDto);
return tzBaseEnterpriseInfoDto;
......@@ -495,6 +507,34 @@ public class TzBaseEnterpriseInfoServiceImpl
}
private void updateUserInfo(ArrayList<String> newDate, String creditCode) {
LambdaQueryWrapper<TzsUserInfo> lambda = new QueryWrapper<TzsUserInfo>().lambda();
lambda.eq(TzsUserInfo::getUnitCode, creditCode);
List<TzsUserInfo> tzsUserInfos = tzsUserInfoMapper.selectList(lambda);
tzsUserInfos.forEach(item -> {
boolean update = false;
JSONArray objects = JSON.parseArray(item.getEquipType());
ArrayList<String> oldDate = new ArrayList<>();
objects.forEach(itemTpe -> {
oldDate.add(itemTpe.toString());
});
for (Object object : objects) {
if (!newDate.contains(object)) {
update = true;
oldDate.remove(object.toString());
}
}
if (update) {
if (!ObjectUtils.isEmpty(oldDate)) {
item.setEquipType(JSON.toJSONString(oldDate));
} else {
item.setEquipType(null);
}
tzsUserInfoMapper.updateById(item);
}
});
}
@Override
public String setLabel(List<Long> enterpriseIds, List<String> enterpriseLabels) {
List<TzBaseEnterpriseInfo> tzBaseEnterpriseInfos = tzBaseEnterpriseInfoMapper.selectBatchIds(enterpriseIds);
......
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/TzsUserEquipServiceImpl.java
View file @ 5245ac50
......@@ -6,6 +6,7 @@ import com.yeejoin.amos.boot.module.tcm.api.mapper.TzsUserEquipMapper;
import com.yeejoin.amos.boot.module.tcm.api.service.ITzsUserEquipService;
import org.springframework.stereotype.Service;
import org.typroject.tyboot.core.rdbms.service.BaseService;
@Service
public class TzsUserEquipServiceImpl extends BaseService<TzsUserEquipDto, TzsUserEquip, TzsUserEquipMapper> implements ITzsUserEquipService {
}
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 @ 5245ac50
......@@ -84,8 +84,10 @@ public class TzsUserInfoServiceImpl extends BaseService<TzsUserInfoDto, TzsUserI
tzsUserInfoDtoPage.getRecords().forEach(item -> {
if (!ObjectUtils.isEmpty(item.getProfile())) {
List<CommonFile> commonFiles = JSON.parseArray(item.getProfile(), CommonFile.class);
if (!ObjectUtils.isEmpty(commonFiles)){
item.setProfile(commonFiles.get(0).getUrl());
}
}
if (!ObjectUtils.isEmpty(item.getBirthday())) {
int age = getAge(item.getBirthday());
item.setAge(Math.max(age, 0));
......@@ -174,22 +176,25 @@ public class TzsUserInfoServiceImpl extends BaseService<TzsUserInfoDto, TzsUserI
if (!ObjectUtils.isEmpty(tzsUserInfo.getPost())) {
tzsUserInfoVo.setPost(JSON.parseArray(tzsUserInfo.getPost()));
}
if (!ObjectUtils.isEmpty(tzsUserInfo.getEquipType())) {
tzsUserInfoVo.setEquipType(JSON.parseArray(tzsUserInfo.getEquipType()));
}
tzsUserInfoVo.setIdentification(ObjectUtils.isEmpty(tzsUserInfo.getIdentification()) ? new ArrayList() : JSON.parseArray(tzsUserInfo.getIdentification()));
tzsUserInfoVo.setProfile(ObjectUtils.isEmpty(tzsUserInfo.getProfile()) ? new ArrayList() : JSON.parseArray(tzsUserInfo.getProfile()));
maps.put("userInfo", tzsUserInfoVo);
LambdaQueryWrapper<TzsUserQualifications> lambda = new QueryWrapper<TzsUserQualifications>().lambda();
lambda.eq(TzsUserQualifications::getUserInfoId, id);
ArrayList<TzsUserQualificationsVo> tzsUserQualificationsVos = new ArrayList<>();
List<TzsUserQualifications> list = tzsUserQualificationsService.getBaseMapper().selectList(lambda);
list.forEach(item -> {
TzsUserQualificationsVo vo = new TzsUserQualificationsVo();
BeanUtils.copyProperties(item, vo, "file");
vo.setFile(ObjectUtils.isEmpty(item.getFile()) ? new ArrayList() : JSON.parseArray(item.getFile()));
tzsUserQualificationsVos.add(vo);
});
HashMap<String, Object> subForm = new HashMap<>();
subForm.put("subForm", tzsUserQualificationsVos);
maps.put("qualificationsInfo", subForm);
// LambdaQueryWrapper<TzsUserQualifications> lambda = new QueryWrapper<TzsUserQualifications>().lambda();
// lambda.eq(TzsUserQualifications::getUserInfoId, id);
// ArrayList<TzsUserQualificationsVo> tzsUserQualificationsVos = new ArrayList<>();
// List<TzsUserQualifications> list = tzsUserQualificationsService.getBaseMapper().selectList(lambda);
// list.forEach(item -> {
// TzsUserQualificationsVo vo = new TzsUserQualificationsVo();
// BeanUtils.copyProperties(item, vo, "file");
// vo.setFile(ObjectUtils.isEmpty(item.getFile()) ? new ArrayList() : JSON.parseArray(item.getFile()));
// tzsUserQualificationsVos.add(vo);
// });
// HashMap<String, Object> subForm = new HashMap<>();
// subForm.put("subForm", tzsUserQualificationsVos);
// maps.put("qualificationsInfo", subForm);
return maps;
}
......@@ -334,6 +339,7 @@ public class TzsUserInfoServiceImpl extends BaseService<TzsUserInfoDto, TzsUserI
if(companyModels.isEmpty()){
return result;
}
result.put("creditCode", companyModels.get(0).getCompanyCode());
boolean productCompany = false;
boolean useCompany = false;
for (CompanyModel companyModel : companyModels) {
......@@ -372,7 +378,7 @@ public class TzsUserInfoServiceImpl extends BaseService<TzsUserInfoDto, TzsUserI
}
@Override
public Boolean equipBind(String type, String userSeq, Map<String,Object> map) {
public Boolean equipBind(String type, String userSeq,String creditCode, Map<String,Object> map) {
Object recordList = map.get("ids");
List<String> ids = (List<String>) recordList;
List<TzsUserEquip> tzsUserEquipList = new ArrayList<>();
......@@ -382,6 +388,7 @@ public class TzsUserInfoServiceImpl extends BaseService<TzsUserInfoDto, TzsUserI
TzsUserEquip tzsUserEquip = new TzsUserEquip();
tzsUserEquip.setEquipId(equipId);
tzsUserEquip.setUserSeq(userSeq);
tzsUserEquip.setCreditCode(creditCode);
tzsUserEquipList.add(tzsUserEquip);
}
flag = tzsUserEquipService.saveBatch(tzsUserEquipList);
......@@ -391,4 +398,16 @@ public class TzsUserInfoServiceImpl extends BaseService<TzsUserInfoDto, TzsUserI
}
return flag;
}
@Override
public List<Map<String, Object>> getUserType(String unitType) {
if (unitType.equals("pro")){
return tzsUserInfoMapper.getUserType("QYRYGW-SCDW");
}else if (unitType.equals("use")){
return tzsUserInfoMapper.getUserType("QYRYGW-SYDW");
}else {
return tzsUserInfoMapper.getUserType(null);
}
}
}
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