From 086c387165953d1c4ed2a1a0878296c9cc47f3b8 Mon Sep 17 00:00:00 2001 From: root <8964602+zxylbj@user.noreply.gitee.com> Date: Thu, 1 Jul 2021 18:17:04 +0800 Subject: [PATCH 1/9] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=9C=BA=E6=9E=84?= =?UTF-8?q?=E4=BA=BA=E5=91=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/resources/application-dev.properties | 2 +- .../controller/TsInstitutionController.java | 12 ++ .../sarInstitution/dao/TsInstitutionDao.java | 15 +++ .../entity/InstitutionAndUser.java | 13 ++ .../sarInstitution/entity/TsInstitution.java | 13 +- .../slrs/sarInstitution/entity/TsUserVO.java | 121 ++++++++++++++++++ .../service/ITsInstitutionService.java | 1 + .../impl/TsInstitutionServiceImpl.java | 52 +++++++- .../sarInstitution/TsInstitutionMapper.xml | 24 ++++ .../tsDictionaryType/TsDicTypeMapper.xml | 1 - 10 files changed, 245 insertions(+), 9 deletions(-) create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/entity/InstitutionAndUser.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/entity/TsUserVO.java diff --git a/adc-da-main/src/main/resources/application-dev.properties b/adc-da-main/src/main/resources/application-dev.properties index 0280f9bd..d89ffe27 100644 --- a/adc-da-main/src/main/resources/application-dev.properties +++ b/adc-da-main/src/main/resources/application-dev.properties @@ -3,7 +3,7 @@ # 数据库配置 #============================================= spring.datasource.driverClassName = com.mysql.cj.jdbc.Driver -spring.datasource.url = jdbc:mysql://39.100.23.127:3306/foton_slrs_test?useUnicode=true&characterEncoding=utf8&serverTimezone=UTC&useSSL=false +spring.datasource.url = jdbc:mysql://192.168.10.47:3306/foton_slrs_test?useUnicode=true&characterEncoding=utf8&serverTimezone=UTC&useSSL=false spring.datasource.username = root spring.datasource.password = root diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/controller/TsInstitutionController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/controller/TsInstitutionController.java index bd0a9c4d..53cae48e 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/controller/TsInstitutionController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/controller/TsInstitutionController.java @@ -47,6 +47,18 @@ public class TsInstitutionController extends BaseController { return Result.success(institutions); } + + /** + * 查询所有机构和人员 + * @return ResponseMessage> + */ + @ApiOperation("查询所有机构和人员") + @GetMapping("/institutionAndUser") + public ResponseMessage> getInstitutionAndUser(){ + List institutions=tsInstitutionService.getInstitutionAndUser(); + return Result.success(institutions); + } + /** * 查询机构人员 * @param institutionId：机构ID diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/dao/TsInstitutionDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/dao/TsInstitutionDao.java index f1c9ed26..f290b050 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/dao/TsInstitutionDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/dao/TsInstitutionDao.java @@ -1,8 +1,11 @@ package com.adc.da.slrs.sarInstitution.dao; +import com.adc.da.slrs.sarInstitution.entity.InstitutionAndUser; import com.adc.da.slrs.sarInstitution.entity.TsInstitution; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import java.util.List; + /** *

* Mapper 接口 @@ -13,4 +16,16 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; */ public interface TsInstitutionDao extends BaseMapper { + /** + * 查询最高级机构及其人员 + * @return List + */ + List selectRootAndUser(); + + /** + * 根据父节点查询机构及其人员 + * @param parentId:父节点Id + * @return List + */ + List selectAndUserByParent(String parentId); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/entity/InstitutionAndUser.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/entity/InstitutionAndUser.java new file mode 100644 index 00000000..08607c1f --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/entity/InstitutionAndUser.java @@ -0,0 +1,13 @@ +package com.adc.da.slrs.sarInstitution.entity; + +import com.adc.da.slrs.sarUser.entity.TsUser; +import lombok.Data; + +import java.util.List; + +@Data +public class InstitutionAndUser { + private TsInstitution institution; + private List users; + private List children; +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/entity/TsInstitution.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/entity/TsInstitution.java index 81976dcf..dcd7e36b 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/entity/TsInstitution.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/entity/TsInstitution.java @@ -1,8 +1,10 @@ package com.adc.da.slrs.sarInstitution.entity; import com.adc.da.base.entity.BaseEntity; +import com.adc.da.slrs.sarUser.entity.TsUser; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; +import com.fasterxml.jackson.annotation.JsonIgnore; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -42,5 +44,14 @@ public class TsInstitution extends BaseEntity { @TableField(exist = false) @ApiModelProperty(value = "子机构") - private List children; + private List children; + + @JsonIgnore + @TableField(exist = false) + @ApiModelProperty(value = "人员") + private List users; + + @TableField(exist = false) + @ApiModelProperty("是否是机构") + private Boolean disabled; } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/entity/TsUserVO.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/entity/TsUserVO.java new file mode 100644 index 00000000..3111f5d9 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/entity/TsUserVO.java @@ -0,0 +1,121 @@ +package com.adc.da.slrs.sarInstitution.entity; + +import com.adc.da.slrs.sarPosition.entity.TsPosition; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; + +import javax.validation.constraints.NotNull; +import java.sql.Timestamp; +import java.util.List; + +@Data +public class TsUserVO { + public interface disable{ + } + + + @ApiModelProperty(value = "主键Id") + @NotNull(message = "userId不能为空",groups = {disable.class}) + @TableId(value = "USID") + private String id; + + @ApiModelProperty(value = "帐户") + @TableField("ACCOUNT") + private String account; + + @ApiModelProperty(value = "密码") + @TableField("PASSWORD") + private String password; + + @ApiModelProperty(value = "用户姓名") + @TableField("UNAME") + private String name; + + @ApiModelProperty(value = "用户性别（1为男，2为女）") + @TableField("SEX") + private String sex; + + @ApiModelProperty(value = "用户来源") + @TableField("USER_SOURCE") + private String userSource; + + @ApiModelProperty(value = "用户手机号") + @TableField("PHONE") + private String phone; + + @ApiModelProperty(value = "用户状态") + @TableField("STATE") + private String state; + + @ApiModelProperty(value = "用户邮箱") + @TableField("EMAIL") + private String email; + + @ApiModelProperty(value = "所属部门名称") + @TableField("INSTITUTION_NAME") + private String institutionName; + + @ApiModelProperty(value = "所属部门ID") + @TableField("INSTITUTION_ID") + private String institutionId; + + @ApiModelProperty(value = "岗位名") + @TableField("POSITION_NAME") + private String positionName; + + @ApiModelProperty(value = "岗位ID") + @TableField("POSITION_ID") + private String positionId; + + @ApiModelProperty(value = "工号") + @TableField("WORK_NUM") + private String workNum; + + @ApiModelProperty(value = "备注") + @TableField("EXT_INFO") + private String extInfo; + + @TableField("OPER_USER") + private String operUser; + + @ApiModelProperty(value = "创建时间") + @TableField("CREATION_TIME") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Timestamp creationTime; + + @ApiModelProperty(value = "修改时间") + @TableField("MODIFY_TIME") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Timestamp modifyTime; + + @ApiModelProperty(value = "是否有效") + @TableField("VALID_FLAG") + private String validFlag; + + @ApiModelProperty(value = "是否禁用（0为未禁用，1为已禁用）") + @NotNull(message = "disableFlag不能为空",groups = {disable.class}) + @TableField("DISABLE_FLAG") + private String disableFlag; + + @ApiModelProperty(value = "是否锁定") + @TableField("UNLOCK_FLAG") + private String unlockFlag; + + @ApiModelProperty(value = "用户类型") + @TableField("USER_TYPE") + private String userType; + + @ApiModelProperty(value = "对接单点登录用户ID") + @TableField("SSO_ID") + private String ssoId; + + @ApiModelProperty(value = "岗位") + @TableField(exist = false) + private List positions; +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/service/ITsInstitutionService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/service/ITsInstitutionService.java index 3d2d7460..cf25a449 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/service/ITsInstitutionService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/service/ITsInstitutionService.java @@ -21,4 +21,5 @@ public interface ITsInstitutionService extends IService { */ List getInstitution(); + List getInstitutionAndUser(); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/service/impl/TsInstitutionServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/service/impl/TsInstitutionServiceImpl.java index 4361d532..459111f9 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/service/impl/TsInstitutionServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/service/impl/TsInstitutionServiceImpl.java @@ -2,7 +2,9 @@ package com.adc.da.slrs.sarInstitution.service.impl; import com.adc.da.slrs.sarInstitution.dao.TsInstitutionDao; +import com.adc.da.slrs.sarInstitution.entity.InstitutionAndUser; import com.adc.da.slrs.sarInstitution.entity.TsInstitution; +import com.adc.da.slrs.sarInstitution.entity.TsUserVO; import com.adc.da.slrs.sarInstitution.service.ITsInstitutionService; import com.adc.da.slrs.sarUser.entity.TsUser; import com.adc.da.slrs.sarUser.service.ITsUserService; @@ -11,6 +13,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.ArrayList; import java.util.List; /** @@ -40,6 +43,40 @@ public class TsInstitutionServiceImpl extends ServiceImpl + */ + private List recursionGetInstitution(TsInstitution tsInstitution){ + List institutionObject=new ArrayList<>(); + QueryWrapper institutionQueryWrapper=new QueryWrapper<>(); + institutionQueryWrapper.eq("parent_id",tsInstitution.getId()); + institutionQueryWrapper.eq("level",tsInstitution.getLevel()+1); + List tsInstitutions=tsInstitutionDao.selectList(institutionQueryWrapper); + for(TsInstitution tsInstitutionNode:tsInstitutions){ + tsInstitutionNode.setChildren(recursionGetInstitution(tsInstitutionNode)); + institutionObject.add(tsInstitutionNode); + } + return institutionObject; + } + + /** + * 查询所有机构 + */ + @Override + public List getInstitutionAndUser() { + //查询第一层机构 + List institutionRoot=tsInstitutionDao.selectRootAndUser(); + for(TsInstitution tsInstitution:institutionRoot){ + tsInstitution.setDisabled(true); + tsInstitution.setChildren(recursionGetInstitutionAndUser(tsInstitution)); + for(TsUserVO user:tsInstitution.getUsers()){ + tsInstitution.getChildren().add(user); + } + } + return institutionRoot; + } @@ -48,14 +85,17 @@ public class TsInstitutionServiceImpl extends ServiceImpl */ - private List recursionGetInstitution(TsInstitution tsInstitution){ - QueryWrapper institutionQueryWrapper=new QueryWrapper<>(); - institutionQueryWrapper.eq("parent_id",tsInstitution.getId()); - institutionQueryWrapper.eq("level",tsInstitution.getLevel()+1); - List tsInstitutions=tsInstitutionDao.selectList(institutionQueryWrapper); + private List recursionGetInstitutionAndUser(TsInstitution tsInstitution){ + List institutionObject=new ArrayList<>(); + List tsInstitutions=tsInstitutionDao.selectAndUserByParent(tsInstitution.getId()); for(TsInstitution tsInstitutionNode:tsInstitutions){ + tsInstitutionNode.setDisabled(true); tsInstitutionNode.setChildren(recursionGetInstitution(tsInstitutionNode)); + institutionObject.add(tsInstitutionNode); + for(TsUserVO user:tsInstitutionNode.getUsers()){ + tsInstitutionNode.getChildren().add(user); + } } - return tsInstitutions; + return institutionObject; } } diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarInstitution/TsInstitutionMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarInstitution/TsInstitutionMapper.xml index fc9dcf3d..6c623498 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarInstitution/TsInstitutionMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarInstitution/TsInstitutionMapper.xml @@ -1,5 +1,29 @@ + + + + + + + + + + + + + + diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/tsDictionaryType/TsDicTypeMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/tsDictionaryType/TsDicTypeMapper.xml index 4f7e14b7..558feffe 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/tsDictionaryType/TsDicTypeMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/tsDictionaryType/TsDicTypeMapper.xml @@ -24,7 +24,6 @@ from ts_dictionary as t_d left join ts_dictype as t_d_t on t_d.ID=t_d_t.DIC_ID where t_d.ENABLE=0 and - t_d.DICTION_TYPE='SEL_OPTION' and t_d_t.DIC_ID is not null and t_d_t.DIC_TYPE_NAME is not null and t_d.DICTIONARY_NAME is not null From 4a8b94408dce53fedab209ecc48d2d54402738b6 Mon Sep 17 00:00:00 2001 From: root <8964602+zxylbj@user.noreply.gitee.com> Date: Fri, 2 Jul 2021 11:02:29 +0800 Subject: [PATCH 2/9] =?UTF-8?q?fetch:=E5=8A=A0=E5=85=A5=E8=B4=9F=E8=BD=BD?= =?UTF-8?q?=E5=9D=87=E8=A1=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/adc/da/main/config/RestTemplateConfig.java | 2 ++ adc-da-main/src/main/resources/application-dev.properties | 4 ++++ .../sarInstitution/service/impl/TsInstitutionServiceImpl.java | 3 ++- 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/adc-da-main/src/main/java/com/adc/da/main/config/RestTemplateConfig.java b/adc-da-main/src/main/java/com/adc/da/main/config/RestTemplateConfig.java index 870c415d..bbfe712d 100644 --- a/adc-da-main/src/main/java/com/adc/da/main/config/RestTemplateConfig.java +++ b/adc-da-main/src/main/java/com/adc/da/main/config/RestTemplateConfig.java @@ -2,6 +2,7 @@ package com.adc.da.main.config; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.springframework.cloud.client.loadbalancer.LoadBalanced; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.http.client.ClientHttpRequestFactory; @@ -23,6 +24,7 @@ public class RestTemplateConfig { private static final Logger logger = LoggerFactory.getLogger(RestTemplateConfig.class); @Bean + @LoadBalanced public RestTemplate restTemplate(ClientHttpRequestFactory factory){ RestTemplate restTemplate = new RestTemplate(factory); // 使用 utf-8 编码集的 conver 替换默认的 conver（默认的 string conver 的编码集为"ISO-8859-1"） diff --git a/adc-da-main/src/main/resources/application-dev.properties b/adc-da-main/src/main/resources/application-dev.properties index d89ffe27..3b50c583 100644 --- a/adc-da-main/src/main/resources/application-dev.properties +++ b/adc-da-main/src/main/resources/application-dev.properties @@ -13,6 +13,10 @@ spring.application.name=FotonLAWSSystem application.code=20200101 application.center=1 #============================================== +#Eruept +eureka.client.allow-redirects=true +eureka.client.register-with-eureka=true +eureka.client.service-url.defaultZone=http://127.0.0.1:8671/eureka/ #============================================== # 邮箱配置1 diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/service/impl/TsInstitutionServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/service/impl/TsInstitutionServiceImpl.java index 459111f9..0da4f112 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/service/impl/TsInstitutionServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/service/impl/TsInstitutionServiceImpl.java @@ -88,9 +88,10 @@ public class TsInstitutionServiceImpl extends ServiceImpl recursionGetInstitutionAndUser(TsInstitution tsInstitution){ List institutionObject=new ArrayList<>(); List tsInstitutions=tsInstitutionDao.selectAndUserByParent(tsInstitution.getId()); + for(TsInstitution tsInstitutionNode:tsInstitutions){ tsInstitutionNode.setDisabled(true); - tsInstitutionNode.setChildren(recursionGetInstitution(tsInstitutionNode)); + tsInstitutionNode.setChildren(recursionGetInstitutionAndUser(tsInstitutionNode)); institutionObject.add(tsInstitutionNode); for(TsUserVO user:tsInstitutionNode.getUsers()){ tsInstitutionNode.getChildren().add(user); From afee88a408a9a2a75ad84264d6f60b1c56611950 Mon Sep 17 00:00:00 2001 From: root <8964602+zxylbj@user.noreply.gitee.com> Date: Fri, 2 Jul 2021 17:32:26 +0800 Subject: [PATCH 3/9] =?UTF-8?q?fetch:=E8=B5=84=E6=BA=90=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/resources/application-dev.properties | 14 ++--- .../impl/SarUserPersonalMenuServiceImpl.java | 2 +- .../controller/TsResourceController.java | 4 +- .../slrs/sarResource/entity/TsResource.java | 59 +++++++++++++++---- .../service/ITsResourceService.java | 5 +- .../service/impl/TsResourceServiceImpl.java | 18 ++++-- .../sarRole/controller/TsRoleController.java | 9 ++- .../adc/da/slrs/sarRole/entity/TsRole.java | 4 ++ .../service/impl/TsRoleServiceImpl.java | 2 +- .../sarUser/controller/TsUserController.java | 4 +- .../slrs/sarUser/service/ITsUserService.java | 2 +- .../service/impl/TsUserServiceImpl.java | 5 +- 12 files changed, 91 insertions(+), 37 deletions(-) diff --git a/adc-da-main/src/main/resources/application-dev.properties b/adc-da-main/src/main/resources/application-dev.properties index 3b50c583..f952ebd8 100644 --- a/adc-da-main/src/main/resources/application-dev.properties +++ b/adc-da-main/src/main/resources/application-dev.properties @@ -14,8 +14,8 @@ application.code=20200101 application.center=1 #============================================== #Eruept -eureka.client.allow-redirects=true -eureka.client.register-with-eureka=true +eureka.client.allow-redirects=false +eureka.client.register-with-eureka=false eureka.client.service-url.defaultZone=http://127.0.0.1:8671/eureka/ #============================================== @@ -35,11 +35,11 @@ spring.mail.port=587 # ============================================== # rabbitMQ # ============================================== -spring.rabbitmq.host=rabbitmq-cluster-01.vs.test.geely.svc -spring.rabbitmq.port=5672 -spring.rabbitmq.virtual-host=uat_pcms -spring.rabbitmq.username=uat_pcms -spring.rabbitmq.password=VxsBLL5bJruwzXfS +#spring.rabbitmq.host=rabbitmq-cluster-01.vs.test.geely.svc +#spring.rabbitmq.port=5672 +#spring.rabbitmq.virtual-host=uat_pcms +#spring.rabbitmq.username=uat_pcms +#spring.rabbitmq.password=VxsBLL5bJruwzXfS # spring.rabbitmq.publisher-confirms=true # ============================================== diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarPersonalCenter/service/impl/SarUserPersonalMenuServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarPersonalCenter/service/impl/SarUserPersonalMenuServiceImpl.java index b1b3ceae..79226046 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarPersonalCenter/service/impl/SarUserPersonalMenuServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarPersonalCenter/service/impl/SarUserPersonalMenuServiceImpl.java @@ -39,7 +39,7 @@ public class SarUserPersonalMenuServiceImpl extends ServiceImpl queryWrapper=new QueryWrapper<>(); - queryWrapper.eq("user_id",queryWrapper); + queryWrapper.eq("user_id",eo.getUserId()); if(eo.getMenuUrl()!=null)queryWrapper.eq("menu_url",eo.getMenuUrl()); if(eo.getMenuName()!=null&&eo.getMenuName().trim().length()>0)queryWrapper.like("menu_name",eo.getMenuName().trim()); if(eo.getState()!=null)queryWrapper.eq("state",eo.getState()); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/controller/TsResourceController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/controller/TsResourceController.java index 3c7ad27e..f287dc62 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/controller/TsResourceController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/controller/TsResourceController.java @@ -31,8 +31,8 @@ public class TsResourceController extends BaseController { @ApiOperation("查询所有资源") @GetMapping - public ResponseMessage> getAll(){ - List tsResources=tsResourceService.getAll(); + public ResponseMessage> getAll(TsResource tsResource){ + List tsResources=tsResourceService.getAll(tsResource); return Result.success(tsResources); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/entity/TsResource.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/entity/TsResource.java index 4cddc2ef..f950192c 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/entity/TsResource.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/entity/TsResource.java @@ -1,6 +1,9 @@ package com.adc.da.slrs.sarResource.entity; import com.adc.da.base.entity.BaseEntity; +import com.adc.da.slrs.sarMenu.entity.SarMenu; +import com.adc.da.utils.treetool.annotation.TreeNodeName; +import com.adc.da.utils.treetool.annotation.TreeNodeParentId; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; @@ -11,6 +14,7 @@ import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; import javax.validation.constraints.NotNull; +import java.util.Date; import java.util.List; /** @@ -31,23 +35,54 @@ public class TsResource extends BaseEntity { private static final long serialVersionUID = 1L; - @ApiModelProperty(value = "路径") - private String href; - @ApiModelProperty(value = "父节点ID") - private String parentId; - @ApiModelProperty(value = "资源名称") - private String name; - - @TableId(type = IdType.UUID) - @NotNull(message = "id不能为空",groups = {update.class}) - @ApiModelProperty(value = "ID") + @NotNull(message = "id不能为空",groups = {SarMenu.update.class}) + @ApiModelProperty(value = "主键") + @TableId(value = "ID",type = IdType.UUID) private String id; + @ApiModelProperty(value = "标准法规划分") + @TableField("SOR_DIVIDE") + private String sorDivide; + + @TreeNodeName + @ApiModelProperty(value = "目录名称") + @TableField("MENU_NAME") + private String menuName; + + @TreeNodeParentId + @ApiModelProperty(value = "父级ID") + @TableField("PARENT_ID") + private String parentId; + + @ApiModelProperty(value = "父级ID集合") + @TableField("PARENT_IDS") + private String parentIds; + + @ApiModelProperty(value = "排序序号") + @TableField("DISPLAY_SEQ") + private Integer displaySeq; + + + @ApiModelProperty(value = "是否有效") + @TableField("VALID_FLAG") + private Integer validFlag; + + @ApiModelProperty(value = "创建时间") + @TableField("CREATION_TIME") + private Date creationTime; + + @ApiModelProperty(value = "修改时间") + @TableField("MODIFY_TIME") + private Date modifyTime; + + @ApiModelProperty(value = "备注") + @TableField("REMARKS") + private String remarks; + + @ApiModelProperty(value = "子菜单") @TableField(exist = false) - @ApiModelProperty("子节点") private List children; - } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/service/ITsResourceService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/service/ITsResourceService.java index 0dfe5a24..ba1d7fe4 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/service/ITsResourceService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/service/ITsResourceService.java @@ -16,7 +16,7 @@ import java.util.List; */ public interface ITsResourceService extends IService { - List getAll(); + List getAll(TsResource tsResource); ResponseMessage addResource(TsResource tsResource); @@ -27,7 +27,8 @@ public interface ITsResourceService extends IService { /** * 通过Ids查询menu * @param resourceIds :菜单Ids + * @param sorDivide * @return List */ - List getResourceByIds(List resourceIds); + List getResourceByIds(List resourceIds, String sorDivide); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/service/impl/TsResourceServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/service/impl/TsResourceServiceImpl.java index 3c284b46..e15836fb 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/service/impl/TsResourceServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/service/impl/TsResourceServiceImpl.java @@ -28,12 +28,16 @@ public class TsResourceServiceImpl extends ServiceImpl getAll() { - QueryWrapper TsResourceQueryWrapper=new QueryWrapper<>(); - TsResourceQueryWrapper.isNull("PARENT_ID"); - List TsResources=dao.selectList(TsResourceQueryWrapper); + public List getAll(TsResource tsResource) { + QueryWrapper tsResourceQueryWrapper=new QueryWrapper<>(); + if(tsResource.getSorDivide()!=null){ + tsResourceQueryWrapper.eq("sor_divide",tsResource.getSorDivide()); + } + tsResourceQueryWrapper.isNull("PARENT_ID"); + List TsResources=dao.selectList(tsResourceQueryWrapper); for(TsResource TsResource:TsResources){ TsResource.setChildren(recursionGetChildren((TsResource))); } @@ -98,12 +102,16 @@ public class TsResourceServiceImpl extends ServiceImpl */ @Override - public List getResourceByIds(List resourceIds) { + public List getResourceByIds(List resourceIds, String sorDivide) { if(resourceIds!=null&&resourceIds.size()>0){ QueryWrapper TsResourceQueryWrapper=new QueryWrapper<>(); + if(sorDivide!=null){ + TsResourceQueryWrapper.eq("sor_divide",sorDivide); + } TsResourceQueryWrapper.in("id",resourceIds); return dao.selectList(TsResourceQueryWrapper); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarRole/controller/TsRoleController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarRole/controller/TsRoleController.java index d29f9159..3f33c2cd 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarRole/controller/TsRoleController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarRole/controller/TsRoleController.java @@ -52,7 +52,7 @@ public class TsRoleController extends BaseController { @ApiOperation("新增角色") @PostMapping - public ResponseMessage addRole(@Validated(TsRole.insert.class) TsRole tsRole){ + public ResponseMessage addRole(@Validated(TsRole.insert.class) @RequestBody TsRole tsRole){ //设置操作人 UserEO userEO=UserUtils.getUser(); tsRole.setOperator(userEO.getUname()); @@ -61,10 +61,11 @@ public class TsRoleController extends BaseController { @ApiOperation("编辑角色") @PutMapping - public ResponseMessage updateRole(@Validated(TsRole.update.class) TsRole tsRole){ + public ResponseMessage updateRole(@Validated(TsRole.update.class)@RequestBody TsRole tsRole){ //设置操作人 UserEO userEO=UserUtils.getUser(); tsRole.setOperator(userEO.getUname()); + System.out.println(tsRole); return tsRoleService.updateRole(tsRole); } @@ -84,6 +85,10 @@ public class TsRoleController extends BaseController { @GetMapping("/id") public ResponseMessage getRoleById(@RequestParam String roleId){ TsRole tsRole=tsRoleService.getById(roleId); + if(tsRole.getParentId()!=null){ + TsRole parent=tsRoleService.getById(tsRole.getParentId()); + tsRole.setParent(parent.getName()); + } return Result.success(tsRole); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarRole/entity/TsRole.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarRole/entity/TsRole.java index 3745aeaa..a2a705b2 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarRole/entity/TsRole.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarRole/entity/TsRole.java @@ -119,5 +119,9 @@ public class TsRole extends BaseEntity { @TableField(exist = false) private List children; + @ApiModelProperty("父节点名称") + @TableField(exist = false) + private String parent; + } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarRole/service/impl/TsRoleServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarRole/service/impl/TsRoleServiceImpl.java index 3db343a2..fc4d2e8d 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarRole/service/impl/TsRoleServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarRole/service/impl/TsRoleServiceImpl.java @@ -115,7 +115,7 @@ public class TsRoleServiceImpl extends ServiceImpl implements */ @Override public ResponseMessage updateRole(TsRole tsRole) { - TsRole oldRole=tsRoleDao.selectById(tsRole.getParentId()); + TsRole oldRole=tsRoleDao.selectById(tsRole.getId()); if(oldRole==null){ return Result.error("该角色不存在"); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/controller/TsUserController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/controller/TsUserController.java index 8aec0495..32a5091a 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/controller/TsUserController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/controller/TsUserController.java @@ -58,8 +58,8 @@ public class TsUserController extends BaseController { @ApiOperation("查询当前登录用户资源") @GetMapping("/resource") - public ResponseMessage> getResource(){ - List resources=tsUserService.getResource(); + public ResponseMessage> getResource(TsResource tsResource){ + List resources=tsUserService.getResource(tsResource); return Result.success(resources); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/service/ITsUserService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/service/ITsUserService.java index 00560dd3..7e84c625 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/service/ITsUserService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/service/ITsUserService.java @@ -47,7 +47,7 @@ public interface ITsUserService extends IService { */ List getMenu(); - List getResource(); + List getResource(TsResource tsResource); /** * 配置个人菜单 diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/service/impl/TsUserServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/service/impl/TsUserServiceImpl.java index dc6b96fa..7f732335 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/service/impl/TsUserServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/service/impl/TsUserServiceImpl.java @@ -132,16 +132,17 @@ public class TsUserServiceImpl extends ServiceImpl implements /** * 查询当前登录的用户资源 * @return List + * @param tsResource */ @Override - public List getResource() { + public List getResource(TsResource tsResource) { UserEO userEO=UserUtils.getUser(); String userId= userEO.getUsid(); System.out.println(userId); List positionIds=tsUserDao.selectPositionIds(userId); List roleIds=tsPositionService.getRoleIdsByPositionIds(positionIds); List resourceIds=tsRoleService.getResourceIdsByRoleIds(roleIds); - return tsResourceService.getResourceByIds(resourceIds); + return tsResourceService.getResourceByIds(resourceIds,tsResource.getSorDivide()); } /** From 531bb9e7ce370cfee887d6c03796e26a8758211e Mon Sep 17 00:00:00 2001 From: yinglong zhang <1679309912@qq.com> Date: Sun, 4 Jul 2021 16:41:37 +0800 Subject: [PATCH 4/9] =?UTF-8?q?feat=20=E5=90=88=E5=B9=B6=E5=88=86=E6=94=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../adc/da/FeignClient/workFlowFeignClient.java | 2 +- .../java/com/adc/da/common/ActDefineStartMap.java | 3 ++- .../src/main/resources/application-dev.properties | 4 ++-- .../src/main/resources/application.properties | 14 +++++++------- .../impl/SarUserPersonalMenuServiceImpl.java | 2 +- .../resources/mybatis/mapper/sys/UserEOMapper.xml | 2 +- 6 files changed, 14 insertions(+), 13 deletions(-) diff --git a/adc-da-activiti/src/main/java/com/adc/da/FeignClient/workFlowFeignClient.java b/adc-da-activiti/src/main/java/com/adc/da/FeignClient/workFlowFeignClient.java index 25d62124..4f434007 100644 --- a/adc-da-activiti/src/main/java/com/adc/da/FeignClient/workFlowFeignClient.java +++ b/adc-da-activiti/src/main/java/com/adc/da/FeignClient/workFlowFeignClient.java @@ -13,7 +13,7 @@ import java.util.List; import java.util.Map; import java.util.Set; -@FeignClient(value = "bat-wkflow") +@FeignClient(value = "bat-wkflow-zqazqazqa") public interface workFlowFeignClient { @RequestMapping(value = "/bat-wkflow/activiti_define_start_user",method = RequestMethod.GET) diff --git a/adc-da-activiti/src/main/java/com/adc/da/common/ActDefineStartMap.java b/adc-da-activiti/src/main/java/com/adc/da/common/ActDefineStartMap.java index 82c9b863..e1a55922 100644 --- a/adc-da-activiti/src/main/java/com/adc/da/common/ActDefineStartMap.java +++ b/adc-da-activiti/src/main/java/com/adc/da/common/ActDefineStartMap.java @@ -15,7 +15,8 @@ public class ActDefineStartMap { Map map = new TreeMap<>(); map.put("1","standardLibraryWkflow"); + map.put("2","standardSurveyWorkFlow"); return map.get(type); } -} +} \ No newline at end of file diff --git a/adc-da-main/src/main/resources/application-dev.properties b/adc-da-main/src/main/resources/application-dev.properties index 0280f9bd..0e53c800 100644 --- a/adc-da-main/src/main/resources/application-dev.properties +++ b/adc-da-main/src/main/resources/application-dev.properties @@ -9,7 +9,7 @@ spring.datasource.password = root #============================================== # 应用设置 -spring.application.name=FotonLAWSSystem +spring.application.name=FotonLAWSSystem-zqazqazqa application.code=20200101 application.center=1 #============================================== @@ -36,7 +36,7 @@ spring.rabbitmq.port=5672 spring.rabbitmq.virtual-host=uat_pcms spring.rabbitmq.username=uat_pcms spring.rabbitmq.password=VxsBLL5bJruwzXfS -# spring.rabbitmq.publisher-confirms=true +#spring.rabbitmq.publisher-confirms=true # ============================================== # 文档存储路径指向 diff --git a/adc-da-main/src/main/resources/application.properties b/adc-da-main/src/main/resources/application.properties index fb1168dc..6b97ffad 100644 --- a/adc-da-main/src/main/resources/application.properties +++ b/adc-da-main/src/main/resources/application.properties @@ -28,19 +28,19 @@ logging.level.org.springframework=info # 请求前缀 restPath=/api #server.servlet.context-path=/api -#Eruept -eureka.client.allow-redirects=true -eureka.client.register-with-eureka=true -eureka.client.service-url.defaultZone=http://101.36.227.25:8050/eureka/ + #是否将自己注册到Eureka Server上，默认为true -#eureka.client.register-with-eureka=false +eureka.client.register-with-eureka=true ##是否从Eureka Server上获取注册信息，默认为true -#eureka.client.fetch-registry=false +eureka.client.fetch-registry=true + #eureka.client.service-url.defaultZone=http://10.5.116.172:8672/eureka/ #eureka.client.service-url.defaultZone=http://127.0.0.1:8671/eureka/ #eureka.client.service-url.defaultZone=http://10.5.116.172:8672/eureka/ -#eureka.client.service-url.defaultZone=http://127.0.0.1:8761/eureka/ + +eureka.client.service-url.defaultZone=http://192.168.10.47:8761/eureka/ + # 请求连接的超时时间 默认的时间为 1 秒 ribbon.ConnectTimeout=500000 # 请求处理的超时时间 diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarPersonalCenter/service/impl/SarUserPersonalMenuServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarPersonalCenter/service/impl/SarUserPersonalMenuServiceImpl.java index b1b3ceae..79226046 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarPersonalCenter/service/impl/SarUserPersonalMenuServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarPersonalCenter/service/impl/SarUserPersonalMenuServiceImpl.java @@ -39,7 +39,7 @@ public class SarUserPersonalMenuServiceImpl extends ServiceImpl queryWrapper=new QueryWrapper<>(); - queryWrapper.eq("user_id",queryWrapper); + queryWrapper.eq("user_id",eo.getUserId()); if(eo.getMenuUrl()!=null)queryWrapper.eq("menu_url",eo.getMenuUrl()); if(eo.getMenuName()!=null&&eo.getMenuName().trim().length()>0)queryWrapper.like("menu_name",eo.getMenuName().trim()); if(eo.getState()!=null)queryWrapper.eq("state",eo.getState()); diff --git a/adc-da-sys/src/main/resources/mybatis/mapper/sys/UserEOMapper.xml b/adc-da-sys/src/main/resources/mybatis/mapper/sys/UserEOMapper.xml index 2ef62938..8220853c 100644 --- a/adc-da-sys/src/main/resources/mybatis/mapper/sys/UserEOMapper.xml +++ b/adc-da-sys/src/main/resources/mybatis/mapper/sys/UserEOMapper.xml @@ -421,7 +421,7 @@ - select from TS_USER u From 1f9f5ac2fab4c91293fe4be4dd2e239ee4e23cd9 Mon Sep 17 00:00:00 2001 From: root <8964602+zxylbj@user.noreply.gitee.com> Date: Sun, 4 Jul 2021 16:45:52 +0800 Subject: [PATCH 5/9] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=9C=BA=E6=9E=84?= =?UTF-8?q?=E4=BA=BA=E5=91=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sarMenu/controller/SarMenuController.java | 4 ++++ .../controller/SarStandardsInfoController.java | 1 + .../impl/SarStandardsInfoServiceImpl.java | 10 +++++++++- .../da/slrs/sarUser/service/ITsUserService.java | 1 + .../sarUser/service/impl/TsUserServiceImpl.java | 16 ++++++++++++++++ .../sarStandardsInfo/SarStandardsInfoMapper.xml | 14 +++++++------- 6 files changed, 38 insertions(+), 8 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenu/controller/SarMenuController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenu/controller/SarMenuController.java index a3cf165f..34537793 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenu/controller/SarMenuController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenu/controller/SarMenuController.java @@ -58,7 +58,9 @@ public class SarMenuController extends BaseController { for (SarMenu resultMenu : resultList) { if ("gxhbq".equals(resultMenu.getId())) { // 查出配置管理项 + System.out.println(resultMenu); List getDicList = dicTypeEOService.getDicTypeByDicId("ZHFKGAACTNUCN9AR5YBM"); + System.out.println(getDicList); if (getDicList != null && !getDicList.isEmpty()) { for (SelectionResult selectionResult : getDicList) { int i=0; @@ -75,6 +77,8 @@ public class SarMenuController extends BaseController { } } resultList.addAll(listDic); + System.out.println("listDic"); + System.out.println(listDic); return Result.success(resultList); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/controller/SarStandardsInfoController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/controller/SarStandardsInfoController.java index df47c5d5..addbb2e4 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/controller/SarStandardsInfoController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/controller/SarStandardsInfoController.java @@ -140,6 +140,7 @@ public class SarStandardsInfoController extends BaseController } } page.setUserId(LoginUserUtil.getUserId()); + System.out.println(page); List rows = sarStandardsInfoEOService.getSarStandardsInfoPage(page); return Result.success(getPageInfo(page.getPager(), rows)); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java index b8c0ea03..3c308f23 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java @@ -16,6 +16,7 @@ import com.adc.da.slrs.sarLawsInfo.page.SarLawsItemsEOPage; import com.adc.da.slrs.sarLawsInfo.service.ISarLawsInfoService; import com.adc.da.slrs.sarLawsItems.service.ISarLawsItemsService; import com.adc.da.slrs.sarProductStand.dao.SarProductStandDao; +import com.adc.da.slrs.sarResource.entity.TsResource; import com.adc.da.slrs.sarSarAccess.service.ISarSarAccessService; import com.adc.da.slrs.sarSarAccessInfo.dao.SarSarAccessInfoDao; import com.adc.da.slrs.sarStandAttrDetails.dao.SarStandAttrDetailsDao; @@ -38,6 +39,7 @@ import com.adc.da.slrs.sarMenu.service.ISarMenuService; import com.adc.da.slrs.sarStandardsInfo.dao.SarStandardsInfoDao; import com.adc.da.slrs.sarStandardsInfo.service.ISarStandardsInfoService; import com.adc.da.slrs.sarUpdLog.service.ISarUpdLogService; +import com.adc.da.slrs.sarUser.service.ITsUserService; import com.adc.da.slrs.sysInfo.service.SysInfoEOService; import com.adc.da.sys.common.SelectionResult; import com.adc.da.sys.constant.ValueStateEnum; @@ -151,6 +153,9 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl getSarStandardsInfoPage(SarStandardsInfoEOPage page) throws Exception { //查询当前登录人角色拥有权限的菜单 - List getMenuIdList = sarMenuEOService.queryRoleMenuIdList(page.getStandType() + "_STAND", null); + List getMenuIdList=tsUserService.getResourceId(new TsResource()); +// List getMenuIdList = sarMenuEOService.queryRoleMenuIdList(page.getStandType() + "_STAND", null); + System.out.println("菜单"); + System.out.println(getMenuIdList); if (getMenuIdList != null && !getMenuIdList.isEmpty()) { page.setMenuRoleList(getMenuIdList); } else { diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/service/ITsUserService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/service/ITsUserService.java index 7e84c625..feb7c4db 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/service/ITsUserService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/service/ITsUserService.java @@ -63,4 +63,5 @@ public interface ITsUserService extends IService { */ public List getMenusByUserId(String userId); + List getResourceId(TsResource tsResource); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/service/impl/TsUserServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/service/impl/TsUserServiceImpl.java index 7f732335..8fe1f319 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/service/impl/TsUserServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/service/impl/TsUserServiceImpl.java @@ -168,4 +168,20 @@ public class TsUserServiceImpl extends ServiceImpl implements List menuIds=tsRoleService.getMenuIdsByRoleIds(roleIds); return sarMenuService.getMenuByIds(menuIds); } + + /** + * 查询当前登录的用户资源 + * @return List + * @param tsResource + */ + @Override + public List getResourceId(TsResource tsResource) { + UserEO userEO=UserUtils.getUser(); + String userId= userEO.getUsid(); + System.out.println(userId); + List positionIds=tsUserDao.selectPositionIds(userId); + List roleIds=tsPositionService.getRoleIdsByPositionIds(positionIds); + return tsRoleService.getResourceIdsByRoleIds(roleIds); + + } } diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml index e725b2f7..67aec86e 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml @@ -381,7 +381,7 @@ left join TS_DICTYPE dicstandNature on (dicstandNature.dic_type_code = SAR_STANDARDS_INFO.stand_nature and dicstandNature.dic_id is not null and dicstandNature.valid_flag = 0 ) left join SAR_STAND_MENU ON SAR_STANDARDS_INFO.id = SAR_STAND_MENU.stand_id - left join SAR_MENU on SAR_STAND_MENU.menu_id = SAR_MENU.id + left join TS_RESOURCE on SAR_STAND_MENU.menu_id = TS_RESOURCE.id left join SAR_STAND_ATTR_INFO on (SAR_STAND_ATTR_INFO.stand_id = SAR_STANDARDS_INFO.id and SAR_STAND_ATTR_INFO.valid_flag=0) left join TS_PERSON_COLLECT on (TS_PERSON_COLLECT.COLLECT_RES_ID = SAR_STANDARDS_INFO.id and TS_PERSON_COLLECT.VALID_FLAG=0) where 1=1 and SAR_STANDARDS_INFO.valid_flag=0 @@ -439,7 +439,7 @@ - + @@ -476,7 +476,7 @@ - + @@ -710,7 +710,7 @@ left join TS_DICTYPE dicstandNature on (dicstandNature.dic_type_code = SAR_STANDARDS_INFO.stand_nature and dicstandNature.dic_id is not null and dicstandNature.valid_flag = 0 ) left join SAR_STAND_MENU ON SAR_STANDARDS_INFO.id = SAR_STAND_MENU.stand_id - left join SAR_MENU on SAR_STAND_MENU.menu_id = SAR_MENU.id + left join TS_RESOURCE on SAR_STAND_MENU.menu_id = TS_RESOURCE.id where SAR_STANDARDS_INFO.id = #{id} GROUP BY @@ -828,7 +828,7 @@ left join TS_DICTYPE dicstandNature on (dicstandNature.dic_type_code = SAR_STANDARDS_INFO.stand_nature and dicstandNature.dic_id is not null and dicstandNature.valid_flag = 0 ) left join SAR_STAND_MENU ON SAR_STANDARDS_INFO.id = SAR_STAND_MENU.stand_id - left join SAR_MENU on SAR_STAND_MENU.menu_id = SAR_MENU.id + left join TS_RESOURCE on SAR_STAND_MENU.menu_id = TS_RESOURCE.id left join SAR_STAND_ATTR_INFO on (SAR_STAND_ATTR_INFO.stand_id = SAR_STANDARDS_INFO.id and SAR_STAND_ATTR_INFO.valid_flag=0) left join TS_PERSON_COLLECT on (TS_PERSON_COLLECT.COLLECT_RES_ID = SAR_STANDARDS_INFO.id and TS_PERSON_COLLECT.VALID_FLAG=0) where 1=1 From 011b5e247a282aaa6ecaaae102dba41ad5efa611 Mon Sep 17 00:00:00 2001 From: root <8964602+zxylbj@user.noreply.gitee.com> Date: Mon, 5 Jul 2021 10:32:41 +0800 Subject: [PATCH 6/9] =?UTF-8?q?=E5=90=8C=E6=AD=A5=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/TsInstitutionController.java | 14 +++++++--- .../sarInstitution/dao/TsInstitutionDao.java | 6 +++++ .../entity/SyncInstitution.java | 27 +++++++++++++++++++ .../sarInstitution/entity/TsInstitution.java | 9 +++++++ .../service/ITsInstitutionService.java | 12 +++++++++ .../impl/TsInstitutionServiceImpl.java | 25 +++++++++++++++++ .../sarInstitution/TsInstitutionMapper.xml | 9 +++++++ .../adc/da/sync/service/SyncUserService.java | 6 +++++ 8 files changed, 104 insertions(+), 4 deletions(-) create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/entity/SyncInstitution.java diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/controller/TsInstitutionController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/controller/TsInstitutionController.java index 53cae48e..ff987ba2 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/controller/TsInstitutionController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/controller/TsInstitutionController.java @@ -9,14 +9,12 @@ import com.adc.da.slrs.sarUser.entity.TsUser; import com.adc.da.slrs.sarUser.service.ITsUserService; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.*; import io.swagger.annotations.Api; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; import com.adc.da.base.web.BaseController; import java.util.List; +import java.util.Map; /** @@ -70,4 +68,12 @@ public class TsInstitutionController extends BaseController { List tsUsers=tsUserService.getUserByInstitutionId(institutionId); return Result.success(tsUsers); } + + @ApiOperation("导入机构数据") + @PostMapping("/import") + public ResponseMessage importInstitution(Map param){ + String json= (String) param.get("json"); + tsInstitutionService.parseInstitution(json); + return Result.success(); + } } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/dao/TsInstitutionDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/dao/TsInstitutionDao.java index f290b050..9b11d375 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/dao/TsInstitutionDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/dao/TsInstitutionDao.java @@ -28,4 +28,10 @@ public interface TsInstitutionDao extends BaseMapper { * @return List */ List selectAndUserByParent(String parentId); + + /** + * 批量插入机构 + * @param tsInstitutions：机构列表 + */ + void batchInsert(List tsInstitutions); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/entity/SyncInstitution.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/entity/SyncInstitution.java new file mode 100644 index 00000000..13006f9e --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/entity/SyncInstitution.java @@ -0,0 +1,27 @@ +package com.adc.da.slrs.sarInstitution.entity; + +import lombok.Data; + +import java.util.ArrayList; +import java.util.List; + +@Data +public class SyncInstitution { + private String orgNumber; + private String orgName; + private String departmentName; + private String orgStatus; + private String orgShortName; + private String parentOrgNumber; + private String orgFullPath; + private String order; + private String modifyTimestamp; + + public static List syncToInstitution(List syncInstitutions){ + List tsInstitutions=new ArrayList<>(); + for(SyncInstitution syncInstitution:syncInstitutions){ + tsInstitutions.add(new TsInstitution(syncInstitution.getOrgNumber(),syncInstitution.getParentOrgNumber(),syncInstitution.getOrgName())); + } + return tsInstitutions; + } +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/entity/TsInstitution.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/entity/TsInstitution.java index dcd7e36b..5bffb3d0 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/entity/TsInstitution.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/entity/TsInstitution.java @@ -54,4 +54,13 @@ public class TsInstitution extends BaseEntity { @TableField(exist = false) @ApiModelProperty("是否是机构") private Boolean disabled; + + public TsInstitution() { + } + + public TsInstitution(String id, String parentId, String name) { + this.id = id; + this.parentId = parentId; + this.name = name; + } } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/service/ITsInstitutionService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/service/ITsInstitutionService.java index cf25a449..0fbfb49e 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/service/ITsInstitutionService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/service/ITsInstitutionService.java @@ -1,7 +1,11 @@ package com.adc.da.slrs.sarInstitution.service; +import com.adc.da.slrs.sarInstitution.entity.SyncInstitution; import com.adc.da.slrs.sarInstitution.entity.TsInstitution; import com.adc.da.slrs.sarUser.entity.TsUser; +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.extension.service.IService; import java.util.List; @@ -22,4 +26,12 @@ public interface ITsInstitutionService extends IService { List getInstitution(); List getInstitutionAndUser(); + + /** + * 批量插入机构 + * @param tsInstitutions：机构列表 + */ + void batchInsert(List tsInstitutions); + + public void parseInstitution(String json); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/service/impl/TsInstitutionServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/service/impl/TsInstitutionServiceImpl.java index 0da4f112..34d82201 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/service/impl/TsInstitutionServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/service/impl/TsInstitutionServiceImpl.java @@ -3,11 +3,16 @@ package com.adc.da.slrs.sarInstitution.service.impl; import com.adc.da.slrs.sarInstitution.dao.TsInstitutionDao; import com.adc.da.slrs.sarInstitution.entity.InstitutionAndUser; +import com.adc.da.slrs.sarInstitution.entity.SyncInstitution; import com.adc.da.slrs.sarInstitution.entity.TsInstitution; import com.adc.da.slrs.sarInstitution.entity.TsUserVO; import com.adc.da.slrs.sarInstitution.service.ITsInstitutionService; import com.adc.da.slrs.sarUser.entity.TsUser; import com.adc.da.slrs.sarUser.service.ITsUserService; +import com.adc.da.sync.service.SyncUserService; +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.beans.factory.annotation.Autowired; @@ -78,6 +83,16 @@ public class TsInstitutionServiceImpl extends ServiceImpl tsInstitutions) { + if(tsInstitutions!=null&&tsInstitutions.size()>0){ + tsInstitutionDao.batchInsert(tsInstitutions); + } + } /** @@ -99,4 +114,14 @@ public class TsInstitutionServiceImpl extends ServiceImpl syncInstitutions=results.toJavaList(SyncInstitution.class); + List tsInstitutions=SyncInstitution.syncToInstitution(syncInstitutions); + batchInsert(tsInstitutions); + } + + } diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarInstitution/TsInstitutionMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarInstitution/TsInstitutionMapper.xml index 6c623498..b914694b 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarInstitution/TsInstitutionMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarInstitution/TsInstitutionMapper.xml @@ -26,4 +26,13 @@ on i.id=u.institution_id where i.parent_id = #{parentId} + + + insert into ts_institution (id,name,parent_id) values + ( + + #{id},#{name},#{parentId} + + ) + diff --git a/adc-da-sys/src/main/java/com/adc/da/sync/service/SyncUserService.java b/adc-da-sys/src/main/java/com/adc/da/sync/service/SyncUserService.java index defd0c5c..2214c03d 100644 --- a/adc-da-sys/src/main/java/com/adc/da/sync/service/SyncUserService.java +++ b/adc-da-sys/src/main/java/com/adc/da/sync/service/SyncUserService.java @@ -1,14 +1,18 @@ package com.adc.da.sync.service; + import com.adc.da.sync.util.AuthUtils; +import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import lombok.extern.slf4j.Slf4j; import net.sf.json.JSONSerializer; import org.apache.commons.codec.binary.Base64; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.HashMap; +import java.util.List; import java.util.Map; @Service("syncUserService") @@ -97,4 +101,6 @@ public class SyncUserService { } while (cookie != null); } + + } From 7bb46ef07f05037d95c7b011aa770afc9e45729c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=A4=8F=E6=99=96?= Date: Mon, 5 Jul 2021 02:34:45 +0000 Subject: [PATCH 7/9] Update application-dev.properties --- adc-da-main/src/main/resources/application-dev.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/adc-da-main/src/main/resources/application-dev.properties b/adc-da-main/src/main/resources/application-dev.properties index a916e2e4..71ba6318 100644 --- a/adc-da-main/src/main/resources/application-dev.properties +++ b/adc-da-main/src/main/resources/application-dev.properties @@ -3,7 +3,7 @@ # 数据库配置 #============================================= spring.datasource.driverClassName = com.mysql.cj.jdbc.Driver -spring.datasource.url = jdbc:mysql://192.168.10.47:3306/foton_slrs_test?useUnicode=true&characterEncoding=utf8&serverTimezone=UTC&useSSL=false +spring.datasource.url = jdbc:mysql://39.100.23.127:3306/foton_slrs_test?useUnicode=true&characterEncoding=utf8&serverTimezone=UTC&useSSL=false spring.datasource.username = root spring.datasource.password = root From c84a8a63ee32201c1ed3a841e9e2e08293a3a2b0 Mon Sep 17 00:00:00 2001 From: root <8964602+zxylbj@user.noreply.gitee.com> Date: Mon, 5 Jul 2021 14:57:15 +0800 Subject: [PATCH 8/9] =?UTF-8?q?fetch:=E6=9C=BA=E6=9E=84=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sarInstitution/controller/TsInstitutionController.java | 6 ++++-- .../service/impl/TsInstitutionServiceImpl.java | 3 +-- .../mybatis/mapper/sarInstitution/TsInstitutionMapper.xml | 5 ++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/controller/TsInstitutionController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/controller/TsInstitutionController.java index ff987ba2..9e0b7c01 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/controller/TsInstitutionController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/controller/TsInstitutionController.java @@ -71,9 +71,11 @@ public class TsInstitutionController extends BaseController { @ApiOperation("导入机构数据") @PostMapping("/import") - public ResponseMessage importInstitution(Map param){ - String json= (String) param.get("json"); + public ResponseMessage importInstitution(){ + String json="{\"status\":\"true\",\"message\":\"成功\",\"cookie\":null,\"returnCode\":\"0\",\"results\":[{\"orgStatus\":\"1\",\"departmentName\":\"信息技术部\",\"orgType\":\"E1\",\"orgName\":\"信息技术部\",\"parentOrgNumber\":\"31000000\",\"orgShortName\":\"信息技术部\",\"orgNumber\":\"30002337\",\"orgFullPath\":\"foton/福田汽车集团/FU/信息技术部\",\"order\":\"null\",\"modifyTimestamp\":\"20191225061931Z\"},{\"orgStatus\":\"1\",\"departmentName\":\"研发工程系统部\",\"orgType\":\"E1\",\"orgName\":\"研发工程系统部\",\"parentOrgNumber\":\"30002337\",\"orgShortName\":\"研发工程系统部\",\"orgNumber\":\"40009091\",\"orgFullPath\":\"foton/福田汽车集团/FU/信息技术部/研发工程系统部\",\"order\":\"null\",\"modifyTimestamp\":\"20191225062001Z\"},{\"orgStatus\":\"1\",\"departmentName\":\"生产与质量系统部\",\"orgType\":\"E1\",\"orgName\":\"生产与质量系统部\",\"parentOrgNumber\":\"30002337\",\"orgShortName\":\"生产与质量系统部\",\"orgNumber\":\"40009092\",\"orgFullPath\":\"foton/福田汽车集团/FU/信息技术部/生产与质量系统部\",\"order\":\"null\",\"modifyTimestamp\":\"20191225062001Z\"},{\"orgStatus\":\"1\",\"departmentName\":\"营销与售后系统部\",\"orgType\":\"E1\",\"orgName\":\"营销与售后系统部\",\"parentOrgNumber\":\"30002337\",\"orgShortName\":\"营销与售后系统部\",\"orgNumber\":\"40009093\",\"orgFullPath\":\"foton/福田汽车集团/FU/信息技术部/营销与售后系统部\",\"order\":\"null\",\"modifyTimestamp\":\"20191225062001Z\"},{\"orgStatus\":\"0\",\"departmentName\":\"财务系统部\",\"orgType\":\"E1\",\"orgName\":\"财务系统部\",\"parentOrgNumber\":\"30002337\",\"orgShortName\":\"财务系统部\",\"orgNumber\":\"40009094\",\"orgFullPath\":\"foton/福田汽车集团/FU/信息技术部/财务系统部\",\"order\":\"null\",\"modifyTimestamp\":\"20200218075121Z\"},{\"orgStatus\":\"0\",\"departmentName\":\"协作系统部\",\"orgType\":\"E1\",\"orgName\":\"协作系统部\",\"parentOrgNumber\":\"30002337\",\"orgShortName\":\"协作系统部\",\"orgNumber\":\"40009095\",\"orgFullPath\":\"foton/福田汽车集团/FU/信息技术部/协作系统部\",\"order\":\"null\",\"modifyTimestamp\":\"20200219011044Z\"},{\"orgStatus\":\"1\",\"departmentName\":\"大数据部\",\"orgType\":\"E1\",\"orgName\":\"大数据部\",\"parentOrgNumber\":\"30002337\",\"orgShortName\":\"大数据部\",\"orgNumber\":\"40009096\",\"orgFullPath\":\"foton/福田汽车集团/FU/信息技术部/大数据部\",\"order\":\"null\",\"modifyTimestamp\":\"20191225062001Z\"},{\"orgStatus\":\"0\",\"departmentName\":\"福田智科\",\"orgType\":\"E1\",\"orgName\":\"福田智科\",\"parentOrgNumber\":\"30002337\",\"orgShortName\":\"福田智科\",\"orgNumber\":\"40009385\",\"orgFullPath\":\"foton/福田汽车集团/FU/信息技术部/福田智科\",\"order\":\"null\",\"modifyTimestamp\":\"20200218075123Z\"},{\"orgStatus\":\"0\",\"departmentName\":\"系统集成与测试部\",\"orgType\":\"E1\",\"orgName\":\"系统集成与测试部\",\"parentOrgNumber\":\"40009385\",\"orgShortName\":\"系统集成与测试部\",\"orgNumber\":\"40009386\",\"orgFullPath\":\"foton/福田汽车集团/FU/信息技术部/福田智科/系统集成与测试部\",\"order\":\"null\",\"modifyTimestamp\":\"20200218075122Z\"},{\"orgStatus\":\"0\",\"departmentName\":\"应用开发部\",\"orgType\":\"E1\",\"orgName\":\"应用开发部\",\"parentOrgNumber\":\"40009385\",\"orgShortName\":\"应用开发部\",\"orgNumber\":\"40009387\",\"orgFullPath\":\"foton/福田汽车集团/FU/信息技术部/福田智科/应用开发部\",\"order\":\"null\",\"modifyTimestamp\":\"20200218075122Z\"},{\"orgStatus\":\"0\",\"departmentName\":\"营销部\",\"orgType\":\"E1\",\"orgName\":\"营销部\",\"parentOrgNumber\":\"40009385\",\"orgShortName\":\"营销部\",\"orgNumber\":\"40009388\",\"orgFullPath\":\"foton/福田汽车集团/FU/信息技术部/福田智科/营销部\",\"order\":\"null\",\"modifyTimestamp\":\"20200218075122Z\"},{\"orgStatus\":\"0\",\"departmentName\":\"服务部\",\"orgType\":\"E1\",\"orgName\":\"服务部\",\"parentOrgNumber\":\"40009385\",\"orgShortName\":\"服务部\",\"orgNumber\":\"40009389\",\"orgFullPath\":\"foton/福田汽车集团/FU/信息技术部/福田智科/服务部\",\"order\":\"null\",\"modifyTimestamp\":\"20200218075122Z\"},{\"orgStatus\":\"0\",\"departmentName\":\"综合管理部\",\"orgType\":\"E1\",\"orgName\":\"综合管理部\",\"parentOrgNumber\":\"40009385\",\"orgShortName\":\"综合管理部\",\"orgNumber\":\"40009390\",\"orgFullPath\":\"foton/福田汽车集团/FU/信息技术部/福田智科/综合管理部\",\"order\":\"null\",\"modifyTimestamp\":\"20200218075122Z\"},{\"orgStatus\":\"1\",\"departmentName\":\"车联网平台开发部\",\"orgType\":\"E1\",\"orgName\":\"车联网平台开发部\",\"parentOrgNumber\":\"30002337\",\"orgShortName\":\"车联网平台开发部\",\"orgNumber\":\"40009391\",\"orgFullPath\":\"foton/福田汽车集团/FU/信息技术部/车联网平台开发部\",\"order\":\"null\",\"modifyTimestamp\":\"20191225062001Z\"},{\"orgStatus\":\"1\",\"departmentName\":\"规划与管理部\",\"orgType\":\"E1\",\"orgName\":\"规划与管理部\",\"parentOrgNumber\":\"30002337\",\"orgShortName\":\"规划与管理部\",\"orgNumber\":\"40009425\",\"orgFullPath\":\"foton/福田汽车集团/FU/信息技术部/规划与管理部\",\"order\":\"null\",\"modifyTimestamp\":\"20200211123206Z\"},{\"orgStatus\":\"0\",\"departmentName\":\"车联网平台开发部\",\"orgType\":\"E1\",\"orgName\":\"车联网平台开发部\",\"parentOrgNumber\":\"40009385\",\"orgShortName\":\"车联网平台开发部\",\"orgNumber\":\"40012865\",\"orgFullPath\":\"foton/福田汽车集团/FU/信息技术部/福田智科/车联网平台开发部\",\"order\":\"null\",\"modifyTimestamp\":\"20200218075121Z\"},{\"orgStatus\":\"1\",\"departmentName\":\"服务支持系统部\",\"orgType\":\"E1\",\"orgName\":\"服务支持系统部\",\"parentOrgNumber\":\"30002337\",\"orgShortName\":\"服务支持系统部\",\"orgNumber\":\"40012871\",\"orgFullPath\":\"foton/福田汽车集团/FU/信息技术部/服务支持系统部\",\"order\":\"null\",\"modifyTimestamp\":\"20191225062018Z\"},{\"orgStatus\":\"1\",\"departmentName\":\"信息安全部\",\"orgType\":\"E1\",\"orgName\":\"信息安全部\",\"parentOrgNumber\":\"30002337\",\"orgShortName\":\"信息安全部\",\"orgNumber\":\"40012872\",\"orgFullPath\":\"foton/福田汽车集团/FU/信息技术部/信息安全部\",\"order\":\"null\",\"modifyTimestamp\":\"20191225062018Z\"},{\"orgStatus\":\"1\",\"departmentName\":\"IT基础设施部\",\"orgType\":\"E1\",\"orgName\":\"IT基础设施部\",\"parentOrgNumber\":\"30002337\",\"orgShortName\":\"IT基础设施部\",\"orgNumber\":\"40012873\",\"orgFullPath\":\"foton/福田汽车集团/FU/信息技术部/IT基础设施部\",\"order\":\"null\",\"modifyTimestamp\":\"20191225062018Z\"},{\"orgStatus\":\"1\",\"departmentName\":\"IT开发中心\",\"orgType\":\"E1\",\"orgName\":\"IT开发中心\",\"parentOrgNumber\":\"30002337\",\"orgShortName\":\"IT开发中心\",\"orgNumber\":\"40012874\",\"orgFullPath\":\"foton/福田汽车集团/FU/信息技术部/IT开发中心\",\"order\":\"null\",\"modifyTimestamp\":\"20191225062018Z\"},{\"orgStatus\":\"1\",\"departmentName\":\"IT共享服务中心\",\"orgType\":\"E1\",\"orgName\":\"IT共享服务中心\",\"parentOrgNumber\":\"30002337\",\"orgShortName\":\"IT共享服务中心\",\"orgNumber\":\"40013000\",\"orgFullPath\":\"foton/福田汽车集团/FU/信息技术部/IT共享服务中心\",\"order\":\"null\",\"modifyTimestamp\":\"20191225062019Z\"},{\"orgStatus\":\"1\",\"departmentName\":\"工业4.0推进办公室\",\"orgType\":\"E1\",\"orgName\":\"工业4.0推进办公室\",\"parentOrgNumber\":\"30002337\",\"orgShortName\":\"工业4.0推进办公室\",\"orgNumber\":\"40013294\",\"orgFullPath\":\"foton/福田汽车集团/FU/信息技术部/工业4.0推进办公室\",\"order\":\"null\",\"modifyTimestamp\":\"20191225062021Z\"}]}"; + tsInstitutionService.parseInstitution(json); return Result.success(); } + } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/service/impl/TsInstitutionServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/service/impl/TsInstitutionServiceImpl.java index 34d82201..93dc8780 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/service/impl/TsInstitutionServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/service/impl/TsInstitutionServiceImpl.java @@ -41,7 +41,7 @@ public class TsInstitutionServiceImpl extends ServiceImpl getInstitution() { //查询第一层机构 QueryWrapper institutionQueryWrapper=new QueryWrapper<>(); - institutionQueryWrapper.eq("level",1); + institutionQueryWrapper.isNull("parent_id").or().eq("parent_id",""); List institutionRoot=tsInstitutionDao.selectList(institutionQueryWrapper); for(TsInstitution tsInstitution:institutionRoot){ tsInstitution.setChildren(recursionGetInstitution(tsInstitution)); @@ -57,7 +57,6 @@ public class TsInstitutionServiceImpl extends ServiceImpl institutionObject=new ArrayList<>(); QueryWrapper institutionQueryWrapper=new QueryWrapper<>(); institutionQueryWrapper.eq("parent_id",tsInstitution.getId()); - institutionQueryWrapper.eq("level",tsInstitution.getLevel()+1); List tsInstitutions=tsInstitutionDao.selectList(institutionQueryWrapper); for(TsInstitution tsInstitutionNode:tsInstitutions){ tsInstitutionNode.setChildren(recursionGetInstitution(tsInstitutionNode)); diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarInstitution/TsInstitutionMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarInstitution/TsInstitutionMapper.xml index b914694b..de116e00 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarInstitution/TsInstitutionMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarInstitution/TsInstitutionMapper.xml @@ -29,10 +29,9 @@ insert into ts_institution (id,name,parent_id) values - ( - #{id},#{name},#{parentId} + ( #{institution.id},#{institution.name},#{institution.parentId} ) - ) + From 773b75a3febcc27edfd096acde0d4b36ee6ad1f9 Mon Sep 17 00:00:00 2001 From: yinglong zhang <1679309912@qq.com> Date: Mon, 5 Jul 2021 15:01:40 +0800 Subject: [PATCH 9/9] =?UTF-8?q?feat=20=E5=90=88=E5=B9=B6=E5=88=86=E6=94=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/adc/da/common/ActDefineStartMap.java | 1 + 1 file changed, 1 insertion(+) diff --git a/adc-da-activiti/src/main/java/com/adc/da/common/ActDefineStartMap.java b/adc-da-activiti/src/main/java/com/adc/da/common/ActDefineStartMap.java index e1a55922..2ce6b4ff 100644 --- a/adc-da-activiti/src/main/java/com/adc/da/common/ActDefineStartMap.java +++ b/adc-da-activiti/src/main/java/com/adc/da/common/ActDefineStartMap.java @@ -16,6 +16,7 @@ public class ActDefineStartMap { Map map = new TreeMap<>(); map.put("1","standardLibraryWkflow"); map.put("2","standardSurveyWorkFlow"); + map.put("3","standardCommentProcessWorkFlow"); return map.get(type); }