Skip to content

A
amos-boot-biz
Commit c9ca7613 authored by 曹盼盼's avatar 曹盼盼
Browse files
Options

小程序修改

parent c235075a
Hide whitespace changes
Inline Side-by-side
Showing with 70 additions and 14 deletions
amos-boot-system-tzs/amos-boot-module-tzs-api/src/main/resources/mapper/TzBaseEnterpriseInfoMapper.xml
View file @ c9ca7613
...@@ -80,6 +80,10 @@ ...@@ -80,6 +80,10 @@
test="tzBaseEnterpriseInfoDto.superviseOrgCode!=null and tzBaseEnterpriseInfoDto.superviseOrgCode!='' "> test="tzBaseEnterpriseInfoDto.superviseOrgCode!=null and tzBaseEnterpriseInfoDto.superviseOrgCode!='' ">
AND supervise_org_code LIKE CONCAT('%',#{tzBaseEnterpriseInfoDto.superviseOrgCode},'%') AND supervise_org_code LIKE CONCAT('%',#{tzBaseEnterpriseInfoDto.superviseOrgCode},'%')
</if> </if>
<if
test="tzBaseEnterpriseInfoDto.address!=null and tzBaseEnterpriseInfoDto.address!='' ">
AND supervise_org_code LIKE CONCAT('%',#{tzBaseEnterpriseInfoDto.address},'%')
</if>
AND is_delete = 0 AND is_delete = 0
</where> </where>
</select> </select>
......
amos-boot-system-tzs/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/biz/controller/TzsAppController.java
View file @ c9ca7613
package com.yeejoin.amos.boot.module.tzs.biz.controller; package com.yeejoin.amos.boot.module.tzs.biz.controller;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.yeejoin.amos.boot.biz.common.bo.ReginParams; import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
...@@ -10,7 +11,11 @@ import com.yeejoin.amos.boot.module.tzs.api.dto.TzBaseEnterpriseInfoDto; ...@@ -10,7 +11,11 @@ import com.yeejoin.amos.boot.module.tzs.api.dto.TzBaseEnterpriseInfoDto;
import com.yeejoin.amos.boot.module.tzs.api.entity.PageParam; import com.yeejoin.amos.boot.module.tzs.api.entity.PageParam;
import com.yeejoin.amos.boot.module.tzs.api.entity.TzBaseEnterpriseInfo; import com.yeejoin.amos.boot.module.tzs.api.entity.TzBaseEnterpriseInfo;
import com.yeejoin.amos.boot.module.tzs.api.service.ITzBaseEnterpriseInfoService; import com.yeejoin.amos.boot.module.tzs.api.service.ITzBaseEnterpriseInfoService;
import com.yeejoin.amos.boot.module.tzs.biz.service.impl.EquipmentCategoryServiceImpl;
import com.yeejoin.amos.boot.module.tzs.biz.service.impl.TzsAppService; import com.yeejoin.amos.boot.module.tzs.biz.service.impl.TzsAppService;
import com.yeejoin.amos.component.feign.model.FeignClientResult;
import com.yeejoin.amos.feign.privilege.Privilege;
import com.yeejoin.amos.feign.privilege.model.PermissionModel;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.ObjectUtils;
...@@ -23,7 +28,12 @@ import org.typroject.tyboot.core.restful.doc.TycloudOperation; ...@@ -23,7 +28,12 @@ import org.typroject.tyboot.core.restful.doc.TycloudOperation;
import org.typroject.tyboot.core.restful.utils.ResponseHelper; import org.typroject.tyboot.core.restful.utils.ResponseHelper;
import org.typroject.tyboot.core.restful.utils.ResponseModel; import org.typroject.tyboot.core.restful.utils.ResponseModel;
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import java.util.Collection;
import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.stream.Collectors;
@RestController @RestController
@Api(tags = "tzs小程序接口") @Api(tags = "tzs小程序接口")
...@@ -34,6 +44,9 @@ public class TzsAppController { ...@@ -34,6 +44,9 @@ public class TzsAppController {
TzsAppService appService; TzsAppService appService;
@Autowired @Autowired
ITzBaseEnterpriseInfoService iTzBaseEnterpriseInfoService; ITzBaseEnterpriseInfoService iTzBaseEnterpriseInfoService;
@Autowired
private EquipmentCategoryServiceImpl equipmentCategoryService;
private static final String LEVEL = "company";
/** /**
* 获取设计信息 * 获取设计信息
...@@ -82,4 +95,36 @@ public class TzsAppController { ...@@ -82,4 +95,36 @@ public class TzsAppController {
return ResponseHelper.buildResponse(iTzBaseEnterpriseInfoService.page(pageParam, neInfo.getUseUnit())); return ResponseHelper.buildResponse(iTzBaseEnterpriseInfoService.page(pageParam, neInfo.getUseUnit()));
} }
/**
* 小程序菜单权限
* */
@TycloudOperation(ApiLevel = UserType.AGENCY)
@RequestMapping(value = "/permission/tree", method = RequestMethod.GET)
@ApiOperation(httpMethod = "GET", value = "小程序菜单权限", notes = "小程序菜单权限")
public FeignClientResult<Collection<PermissionModel>> tree(HttpServletRequest http) {
//判断当前身份
String token = http.getHeader("token");
FeignClientResult<Collection<PermissionModel>> app;
app = Privilege.permissionClient.queryPermissionTree("APP", null, null, null, null);
//根据当前登录人的公司是企业还是监管来过滤
JSONObject object = equipmentCategoryService.getCompanyType();
String level = object.getString("level");
if (!ValidationUtil.isEmpty(level)) {
if (LEVEL.equals(level)) {
//企业
Collection<PermissionModel> result = app.getResult();
List<PermissionModel> lists = result.stream().filter(item -> item.getAppName().equals("企业端")).collect(Collectors.toList());
app.setResult(lists);
} else {
//监管
Collection<PermissionModel> result = app.getResult();
List<PermissionModel> lists = result.stream().filter(item -> item.getAppName().equals("监管端")).collect(Collectors.toList());
app.setResult(lists);
}
}
return app;
}
} }
amos-boot-system-tzs/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/biz/service/impl/TzBaseEnterpriseInfoServiceImpl.java
View file @ c9ca7613
...@@ -157,10 +157,12 @@ public class TzBaseEnterpriseInfoServiceImpl ...@@ -157,10 +157,12 @@ public class TzBaseEnterpriseInfoServiceImpl
List<BaseUnitLicence> unitLicences = baseUnitLicenceService.list(new LambdaQueryWrapper<BaseUnitLicence>() List<BaseUnitLicence> unitLicences = baseUnitLicenceService.list(new LambdaQueryWrapper<BaseUnitLicence>()
.eq(BaseUnitLicence::getUnitCode, tzBaseEnterpriseInfo.getUseCode())); .eq(BaseUnitLicence::getUnitCode, tzBaseEnterpriseInfo.getUseCode()));
List<BaseUnitLicenceDto> unitLicenceDtos = new ArrayList<BaseUnitLicenceDto>(); List<BaseUnitLicenceDto> unitLicenceDtos = new ArrayList<BaseUnitLicenceDto>();
for (BaseUnitLicence baseUnitLicence : unitLicences) { if (!ValidationUtil.isEmpty(unitLicences)) {
BaseUnitLicenceDto baseUnitLicenceDto = new BaseUnitLicenceDto(); for (BaseUnitLicence baseUnitLicence : unitLicences) {
BeanUtils.copyProperties(baseUnitLicence, baseUnitLicenceDto); BaseUnitLicenceDto baseUnitLicenceDto = new BaseUnitLicenceDto();
unitLicenceDtos.add(baseUnitLicenceDto); BeanUtils.copyProperties(baseUnitLicence, baseUnitLicenceDto);
unitLicenceDtos.add(baseUnitLicenceDto);
}
} }
tzBaseEnterpriseInfoDto.setUnitLicences(unitLicenceDtos); tzBaseEnterpriseInfoDto.setUnitLicences(unitLicenceDtos);
// 管理员信息 // 管理员信息
...@@ -170,7 +172,7 @@ public class TzBaseEnterpriseInfoServiceImpl ...@@ -170,7 +172,7 @@ public class TzBaseEnterpriseInfoServiceImpl
if (regUnitInfo != null) { if (regUnitInfo != null) {
BeanUtils.copyProperties(regUnitInfo, regUnitInfoDto); BeanUtils.copyProperties(regUnitInfo, regUnitInfoDto);
} }
regUnitInfoDto.setAdminIdCardPhoto(ObjectUtils.isEmpty(regUnitInfo.getAdminIdCardPhoto()) ? new ArrayList() : JSON.parseArray(regUnitInfo.getAdminIdCardPhoto())); regUnitInfoDto.setAdminIdCardPhoto((ValidationUtil.isEmpty(regUnitInfo)||ValidationUtil.isEmpty(regUnitInfo.getAdminIdCardPhoto())) ? new ArrayList() : JSON.parseArray(regUnitInfo.getAdminIdCardPhoto()));
tzBaseEnterpriseInfoDto.setRegUnitInfoDto(regUnitInfoDto); tzBaseEnterpriseInfoDto.setRegUnitInfoDto(regUnitInfoDto);
// 工商信息 // 工商信息
...@@ -266,11 +268,14 @@ public class TzBaseEnterpriseInfoServiceImpl ...@@ -266,11 +268,14 @@ public class TzBaseEnterpriseInfoServiceImpl
List<BaseUnitLicence> unitLicences = baseUnitLicenceService.list(new LambdaQueryWrapper<BaseUnitLicence>() List<BaseUnitLicence> unitLicences = baseUnitLicenceService.list(new LambdaQueryWrapper<BaseUnitLicence>()
.eq(BaseUnitLicence::getUnitCode, tzBaseEnterpriseInfo.getUseCode())); .eq(BaseUnitLicence::getUnitCode, tzBaseEnterpriseInfo.getUseCode()));
List<BaseUnitLicenceDto> unitLicenceDtos = new ArrayList<BaseUnitLicenceDto>(); List<BaseUnitLicenceDto> unitLicenceDtos = new ArrayList<BaseUnitLicenceDto>();
for (BaseUnitLicence baseUnitLicence : unitLicences) { if (!ValidationUtil.isEmpty(unitLicences)) {
BaseUnitLicenceDto baseUnitLicenceDto = new BaseUnitLicenceDto(); for (BaseUnitLicence baseUnitLicence : unitLicences) {
BeanUtils.copyProperties(baseUnitLicence, baseUnitLicenceDto); BaseUnitLicenceDto baseUnitLicenceDto = new BaseUnitLicenceDto();
unitLicenceDtos.add(baseUnitLicenceDto); BeanUtils.copyProperties(baseUnitLicence, baseUnitLicenceDto);
unitLicenceDtos.add(baseUnitLicenceDto);
}
} }
tzBaseEnterpriseInfoDto.setUnitLicences(unitLicenceDtos); tzBaseEnterpriseInfoDto.setUnitLicences(unitLicenceDtos);
// 工商信息 // 工商信息
RegUnitIc regUnitIc = regUnitIcService.getOne( RegUnitIc regUnitIc = regUnitIcService.getOne(
...@@ -513,7 +518,6 @@ public class TzBaseEnterpriseInfoServiceImpl ...@@ -513,7 +518,6 @@ public class TzBaseEnterpriseInfoServiceImpl
} }
public void setSpeUseUnitState(int state,SpeUseUnit speUseUnit){ public void setSpeUseUnitState(int state,SpeUseUnit speUseUnit){
speUseUnit.setSyncState(state); speUseUnit.setSyncState(state);
speUseUnitService.updateById(speUseUnit); speUseUnitService.updateById(speUseUnit);
......
amos-boot-system-tzs/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/biz/service/impl/TzsAppService.java
View file @ c9ca7613
...@@ -212,11 +212,14 @@ public class TzsAppService { ...@@ -212,11 +212,14 @@ public class TzsAppService {
List entityList = service.list(wrapper); List entityList = service.list(wrapper);
Iterator iterator = entityList.iterator(); Iterator iterator = entityList.iterator();
if(!isOne) { if(!isOne) {
while (iterator.hasNext()) { if (!ValidationUtil.isEmpty(entityList)) {
JSONObject jsonObject = JSON.parseObject(JSON.toJSONString(iterator.next())); while (iterator.hasNext()) {
JSONObject result = getFieldList(dto, jsonObject,null); JSONObject jsonObject = JSON.parseObject(JSON.toJSONString(iterator.next()));
list.add(result); JSONObject result = getFieldList(dto, jsonObject,null);
list.add(result);
}
} }
} else { } else {
int count = entityList.size(); int count = entityList.size();
JSONObject jsonObject = JSON.parseObject(JSON.toJSONString(iterator.next())); JSONObject jsonObject = JSON.parseObject(JSON.toJSONString(iterator.next()));
......
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