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

# Conflicts:
#	adc-da-activiti/src/main/java/com/adc/da/FeignClient/workFlowFeignClient.java
#	adc-da-activiti/src/main/java/com/adc/da/common/ActDefineStartMap.java

adc-da-activiti/src/main/java/com/adc/da/common/ActDefineStartMap.java

@@ -15,6 +15,9 @@ public class ActDefineStartMap {
 
         Map<String,String> map = new TreeMap<>();
         map.put("1","standardLibraryWkflow");
+        map.put("2","standardSurveyWorkFlow");
+        map.put("3","standardCommentProcessWorkFlow");
+
         map.put("3","standardregulatoryinventory");
         return map.get(type);
     }

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;
@@ -24,6 +25,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"）

adc-da-main/src/main/resources/application-dev.properties

@@ -9,10 +9,14 @@ spring.datasource.password = root
 
 #==============================================
 # 应用设置
-spring.application.name=FotonLAWSSystem
+spring.application.name=FotonLAWSSystem-zqazqazqa
 application.code=20200101
 application.center=1
 #==============================================
+#Eruept
+eureka.client.allow-redirects=false
+eureka.client.register-with-eureka=false
+eureka.client.service-url.defaultZone=http://127.0.0.1:8671/eureka/
 
 #==============================================
 # 邮箱配置1

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
 # 请求处理的超时时间

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;
+
 /**
  * <p>
  *  Mapper 接口
@@ -13,4 +16,22 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface TsInstitutionDao extends BaseMapper<TsInstitution> {
 
+    /**
+     * 查询最高级机构及其人员
+     * @return List<TsInstitution>
+     */
+    List<TsInstitution> selectRootAndUser();
+
+    /**
+     * 根据父节点查询机构及其人员
+     * @param parentId:父节点Id
+     * @return List<TsInstitution>
+     */
+    List<TsInstitution> selectAndUserByParent(String parentId);
+
+    /**
+     * 批量插入机构
+     * @param tsInstitutions：机构列表
+     */
+    void batchInsert(List<TsInstitution> tsInstitutions);
 }

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<TsUser> users;
+    private List<InstitutionAndUser> children;
+}

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<TsInstitution> syncToInstitution(List<SyncInstitution> syncInstitutions){
+        List<TsInstitution> tsInstitutions=new ArrayList<>();
+        for(SyncInstitution syncInstitution:syncInstitutions){
+            tsInstitutions.add(new TsInstitution(syncInstitution.getOrgNumber(),syncInstitution.getParentOrgNumber(),syncInstitution.getOrgName()));
+        }
+        return tsInstitutions;
+    }
+}

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,23 @@ public class TsInstitution extends BaseEntity {
 
     @TableField(exist = false)
     @ApiModelProperty(value = "子机构")
-    private List<TsInstitution> children;
+    private List<Object> children;
+
+    @JsonIgnore
+    @TableField(exist = false)
+    @ApiModelProperty(value = "人员")
+    private List<TsUserVO> users;
+
+    @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;
+    }
 }

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<TsPosition> positions;
+}

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;
@@ -21,4 +25,13 @@ public interface ITsInstitutionService extends IService<TsInstitution> {
      */
     List<TsInstitution> getInstitution();
 
+    List<TsInstitution> getInstitutionAndUser();
+
+    /**
+     * 批量插入机构
+     * @param tsInstitutions：机构列表
+     */
+    void batchInsert(List<TsInstitution> tsInstitutions);
+
+    public void parseInstitution(String json);
 }

adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/service/impl/TsInstitutionServiceImpl.java

@@ -2,15 +2,23 @@ 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;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -33,14 +41,57 @@ public class TsInstitutionServiceImpl extends ServiceImpl<TsInstitutionDao, TsIn
     public List<TsInstitution> getInstitution() {
         //查询第一层机构
         QueryWrapper<TsInstitution> institutionQueryWrapper=new QueryWrapper<>();
-        institutionQueryWrapper.eq("level",1);
+        institutionQueryWrapper.isNull("parent_id").or().eq("parent_id","");
         List<TsInstitution> institutionRoot=tsInstitutionDao.selectList(institutionQueryWrapper);
         for(TsInstitution tsInstitution:institutionRoot){
             tsInstitution.setChildren(recursionGetInstitution(tsInstitution));
         }
         return institutionRoot;
     }
+    /**
+     * 递归获取子机构
+     * @param tsInstitution：父机构
+     * @return List<TsInstitution>
+     */
+    private List<Object> recursionGetInstitution(TsInstitution tsInstitution){
+        List<Object> institutionObject=new ArrayList<>();
+        QueryWrapper<TsInstitution> institutionQueryWrapper=new QueryWrapper<>();
+        institutionQueryWrapper.eq("parent_id",tsInstitution.getId());
+        List<TsInstitution> tsInstitutions=tsInstitutionDao.selectList(institutionQueryWrapper);
+        for(TsInstitution tsInstitutionNode:tsInstitutions){
+            tsInstitutionNode.setChildren(recursionGetInstitution(tsInstitutionNode));
+            institutionObject.add(tsInstitutionNode);
+        }
+        return institutionObject;
+    }
 
+    /**
+     * 查询所有机构
+     */
+    @Override
+    public List<TsInstitution> getInstitutionAndUser() {
+        //查询第一层机构
+        List<TsInstitution> 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;
+    }
+
+    /**
+     * 批量插入机构
+     * @param tsInstitutions：机构列表
+     */
+    @Override
+    public void batchInsert(List<TsInstitution> tsInstitutions) {
+        if(tsInstitutions!=null&&tsInstitutions.size()>0){
+            tsInstitutionDao.batchInsert(tsInstitutions);
+        }
+    }
 
 
     /**
@@ -48,14 +99,28 @@ public class TsInstitutionServiceImpl extends ServiceImpl<TsInstitutionDao, TsIn
      * @param tsInstitution：父机构
      * @return List<TsInstitution>
      */
-    private List<TsInstitution> recursionGetInstitution(TsInstitution tsInstitution){
+    private List<Object> recursionGetInstitutionAndUser(TsInstitution tsInstitution){
-        QueryWrapper<TsInstitution> institutionQueryWrapper=new QueryWrapper<>();
+        List<Object> institutionObject=new ArrayList<>();
-        institutionQueryWrapper.eq("parent_id",tsInstitution.getId());
+        List<TsInstitution> tsInstitutions=tsInstitutionDao.selectAndUserByParent(tsInstitution.getId());
-        institutionQueryWrapper.eq("level",tsInstitution.getLevel()+1);
+
-        List<TsInstitution> tsInstitutions=tsInstitutionDao.selectList(institutionQueryWrapper);
         for(TsInstitution tsInstitutionNode:tsInstitutions){
-            tsInstitutionNode.setChildren(recursionGetInstitution(tsInstitutionNode));
+            tsInstitutionNode.setDisabled(true);
+            tsInstitutionNode.setChildren(recursionGetInstitutionAndUser(tsInstitutionNode));
+            institutionObject.add(tsInstitutionNode);
+            for(TsUserVO user:tsInstitutionNode.getUsers()){
+                tsInstitutionNode.getChildren().add(user);
+            }
         }
-        return tsInstitutions;
+        return institutionObject;
     }
+
+    public void parseInstitution(String json){
+        JSONObject jsonObject= JSON.parseObject(json);
+        JSONArray results=jsonObject.getJSONArray("results");
+        List<SyncInstitution> syncInstitutions=results.toJavaList(SyncInstitution.class);
+        List<TsInstitution> tsInstitutions=SyncInstitution.syncToInstitution(syncInstitutions);
+        batchInsert(tsInstitutions);
+    }
+
+
 }

adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenu/controller/SarMenuController.java

@@ -58,7 +58,9 @@ public class SarMenuController extends BaseController<SarMenu> {
         for (SarMenu resultMenu : resultList) {
             if ("gxhbq".equals(resultMenu.getId())) {
                 // 查出配置管理项
+                System.out.println(resultMenu);
                 List<SelectionResult> 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<SarMenu> {
             }
         }
         resultList.addAll(listDic);
+        System.out.println("listDic");
+        System.out.println(listDic);
         return Result.success(resultList);
     }
 

adc-da-slrs/src/main/java/com/adc/da/slrs/sarPersonalCenter/service/impl/SarUserPersonalMenuServiceImpl.java

@@ -39,7 +39,7 @@ public class SarUserPersonalMenuServiceImpl extends ServiceImpl<SarUserPersonalM
             return Result.error("userId不能为空");
         }
         QueryWrapper<SarUserPersonalMenu> 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());

adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/controller/TsResourceController.java

@@ -31,8 +31,8 @@ public class TsResourceController extends BaseController<TsResource> {
     
     @ApiOperation("查询所有资源")
     @GetMapping
-    public ResponseMessage<List<TsResource>> getAll(){
+    public ResponseMessage<List<TsResource>> getAll(TsResource tsResource){
-        List<TsResource> tsResources=tsResourceService.getAll();
+        List<TsResource> tsResources=tsResourceService.getAll(tsResource);
         return Result.success(tsResources);
     }
 

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 = "资源名称")
+    @NotNull(message = "id不能为空",groups = {SarMenu.update.class})
-    private String name;
+    @ApiModelProperty(value = "主键")
-
+    @TableId(value = "ID",type = IdType.UUID)
-    @TableId(type = IdType.UUID)
-    @NotNull(message = "id不能为空",groups = {update.class})
-    @ApiModelProperty(value = "ID")
     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<TsResource> children;
 
-
 }

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<TsResource> {
 
-    List<TsResource> getAll();
+    List<TsResource> getAll(TsResource tsResource);
 
     ResponseMessage<Object> addResource(TsResource tsResource);
 
@@ -27,7 +27,8 @@ public interface ITsResourceService extends IService<TsResource> {
     /**
      * 通过Ids查询menu
      * @param resourceIds :菜单Ids
+     * @param sorDivide
      * @return List<Menu>
      */
-    List<TsResource> getResourceByIds(List<String> resourceIds);
+    List<TsResource> getResourceByIds(List<String> resourceIds, String sorDivide);
 }

adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/service/impl/TsResourceServiceImpl.java

@@ -28,12 +28,16 @@ public class TsResourceServiceImpl extends ServiceImpl<TsResourceDao, TsResource
     private TsResourceDao dao;
     /**
      * 查询所有菜单
+     * @param tsResource
      */
     @Override
-    public List<TsResource> getAll() {
+    public List<TsResource> getAll(TsResource tsResource) {
-        QueryWrapper<TsResource> TsResourceQueryWrapper=new QueryWrapper<>();
+        QueryWrapper<TsResource> tsResourceQueryWrapper=new QueryWrapper<>();
-        TsResourceQueryWrapper.isNull("PARENT_ID");
+        if(tsResource.getSorDivide()!=null){
-        List<TsResource> TsResources=dao.selectList(TsResourceQueryWrapper);
+            tsResourceQueryWrapper.eq("sor_divide",tsResource.getSorDivide());
+        }
+        tsResourceQueryWrapper.isNull("PARENT_ID");
+        List<TsResource> TsResources=dao.selectList(tsResourceQueryWrapper);
         for(TsResource TsResource:TsResources){
             TsResource.setChildren(recursionGetChildren((TsResource)));
         }
@@ -98,12 +102,16 @@ public class TsResourceServiceImpl extends ServiceImpl<TsResourceDao, TsResource
     /**
      * 通过Ids查询Resource
      * @param resourceIds :菜单Ids
+     * @param sorDivide
      * @return List<Resource>
      */
     @Override
-    public List<TsResource> getResourceByIds(List<String> resourceIds) {
+    public List<TsResource> getResourceByIds(List<String> resourceIds, String sorDivide) {
         if(resourceIds!=null&&resourceIds.size()>0){
             QueryWrapper<TsResource> TsResourceQueryWrapper=new QueryWrapper<>();
+            if(sorDivide!=null){
+                TsResourceQueryWrapper.eq("sor_divide",sorDivide);
+            }
             TsResourceQueryWrapper.in("id",resourceIds);
             return dao.selectList(TsResourceQueryWrapper);
         }

adc-da-slrs/src/main/java/com/adc/da/slrs/sarRole/controller/TsRoleController.java

@@ -52,7 +52,7 @@ public class TsRoleController extends BaseController<TsRole> {
 
     @ApiOperation("新增角色")
     @PostMapping
-    public ResponseMessage<Object> addRole(@Validated(TsRole.insert.class) TsRole tsRole){
+    public ResponseMessage<Object> 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<TsRole> {
 
     @ApiOperation("编辑角色")
     @PutMapping
-    public ResponseMessage<Object> updateRole(@Validated(TsRole.update.class) TsRole tsRole){
+    public ResponseMessage<Object> 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<TsRole> {
     @GetMapping("/id")
     public ResponseMessage<TsRole> 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);
     }
 

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<TsRole> children;
 
+    @ApiModelProperty("父节点名称")
+    @TableField(exist = false)
+    private String parent;
+
 
 }

adc-da-slrs/src/main/java/com/adc/da/slrs/sarRole/service/impl/TsRoleServiceImpl.java

@@ -115,7 +115,7 @@ public class TsRoleServiceImpl extends ServiceImpl<TsRoleDao, TsRole> implements
      */
     @Override
     public ResponseMessage<Object> updateRole(TsRole tsRole) {
-        TsRole oldRole=tsRoleDao.selectById(tsRole.getParentId());
+        TsRole oldRole=tsRoleDao.selectById(tsRole.getId());
         if(oldRole==null){
             return Result.error("该角色不存在");
         }

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/controller/SarStandardsInfoController.java

@@ -140,6 +140,7 @@ public class SarStandardsInfoController extends BaseController<SarStandardsInfo>
             }
         }
         page.setUserId(LoginUserUtil.getUserId());
+        System.out.println(page);
         List<SarStandardsInfo> rows = sarStandardsInfoEOService.getSarStandardsInfoPage(page);
         return Result.success(getPageInfo(page.getPager(), rows));
     }

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<SarStandardsInfoDao
     @Autowired
     private SysInfoEOService sysInfoEOService;
 
+    @Autowired
+    private ITsUserService tsUserService;
+
 
     /***
      * @Description: 分页查询
@@ -161,7 +166,10 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
      */
     public List<SarStandardsInfo> getSarStandardsInfoPage(SarStandardsInfoEOPage page) throws Exception {
         //查询当前登录人角色拥有权限的菜单
-        List<String> getMenuIdList = sarMenuEOService.queryRoleMenuIdList(page.getStandType() + "_STAND", null);
+        List<String> getMenuIdList=tsUserService.getResourceId(new TsResource());
+//        List<String> getMenuIdList = sarMenuEOService.queryRoleMenuIdList(page.getStandType() + "_STAND", null);
+        System.out.println("菜单");
+        System.out.println(getMenuIdList);
         if (getMenuIdList != null && !getMenuIdList.isEmpty()) {
             page.setMenuRoleList(getMenuIdList);
         } else {

adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/controller/TsUserController.java

@@ -58,8 +58,8 @@ public class TsUserController extends BaseController<TsUser> {
 
     @ApiOperation("查询当前登录用户资源")
     @GetMapping("/resource")
-    public ResponseMessage<List<TsResource>> getResource(){
+    public ResponseMessage<List<TsResource>> getResource(TsResource tsResource){
-        List<TsResource> resources=tsUserService.getResource();
+        List<TsResource> resources=tsUserService.getResource(tsResource);
         return Result.success(resources);
     }
 

adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/service/ITsUserService.java

@@ -47,7 +47,7 @@ public interface ITsUserService extends IService<TsUser> {
      */
     List<SarMenu> getMenu();
 
-    List<TsResource> getResource();
+    List<TsResource> getResource(TsResource tsResource);
 
     /**
      * 配置个人菜单
@@ -63,4 +63,5 @@ public interface ITsUserService extends IService<TsUser> {
      */
     public List<SarMenu> getMenusByUserId(String userId);
 
+    List<String> getResourceId(TsResource tsResource);
 }

adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/service/impl/TsUserServiceImpl.java

@@ -132,16 +132,17 @@ public class TsUserServiceImpl extends ServiceImpl<TsUserDao, TsUser> implements
     /**
      * 查询当前登录的用户资源
      * @return List<SarMenu>
+     * @param tsResource
      */
     @Override
-    public List<TsResource> getResource() {
+    public List<TsResource> getResource(TsResource tsResource) {
         UserEO userEO=UserUtils.getUser();
         String userId= userEO.getUsid();
         System.out.println(userId);
         List<String> positionIds=tsUserDao.selectPositionIds(userId);
         List<String> roleIds=tsPositionService.getRoleIdsByPositionIds(positionIds);
         List<String> resourceIds=tsRoleService.getResourceIdsByRoleIds(roleIds);
-        return tsResourceService.getResourceByIds(resourceIds);
+        return tsResourceService.getResourceByIds(resourceIds,tsResource.getSorDivide());
     }
 
     /**
@@ -167,4 +168,20 @@ public class TsUserServiceImpl extends ServiceImpl<TsUserDao, TsUser> implements
         List<String> menuIds=tsRoleService.getMenuIdsByRoleIds(roleIds);
         return sarMenuService.getMenuByIds(menuIds);
     }
+
+    /**
+     * 查询当前登录的用户资源
+     * @return List<SarMenu>
+     * @param tsResource
+     */
+    @Override
+    public List<String> getResourceId(TsResource tsResource) {
+        UserEO userEO=UserUtils.getUser();
+        String userId= userEO.getUsid();
+        System.out.println(userId);
+        List<String> positionIds=tsUserDao.selectPositionIds(userId);
+        List<String> roleIds=tsPositionService.getRoleIdsByPositionIds(positionIds);
+        return tsRoleService.getResourceIdsByRoleIds(roleIds);
+
+    }
 }

adc-da-slrs/src/main/resources/mybatis/mapper/sarInstitution/TsInstitutionMapper.xml

@@ -1,5 +1,37 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.adc.da.slrs.sarInstitution.dao.TsInstitutionDao">
+    <resultMap id="InstitutionAndUser" type="com.adc.da.slrs.sarInstitution.entity.TsInstitution">
+        <id column="id" property="id"/>
+        <result column="parent_id" property="parentId"/>
+        <result column="level" property="level"/>
+        <result column="name" property="name"/>
+        <collection property="users" ofType="com.adc.da.slrs.sarInstitution.entity.TsUserVO">
+            <result column="usid" property="id"/>
+            <result column="account" property="account"/>
+            <result column="uname" property="name"/>
+            <result column="institution_id" property="institutionId"/>
+        </collection>
+    </resultMap>
+    <select id="selectRootAndUser" resultMap="InstitutionAndUser">
+        select i.*,u.usid,u.account,u.uname,u.institution_id from ts_institution i
+        left join ts_user u
+        on i.id=u.institution_id
+        where i.parent_id is null or i.parent_id=''
+    </select>
 
+    <select id="selectAndUserByParent" resultMap="InstitutionAndUser">
+         select i.*,u.usid,u.account,u.uname,u.institution_id from ts_institution i
+        left join ts_user u
+        on i.id=u.institution_id
+        where i.parent_id = #{parentId}
+    </select>
+
+    <insert id="batchInsert">
+        insert into ts_institution (id,name,parent_id) values
+        <foreach collection="list" item="institution" separator=",">
+           ( #{institution.id},#{institution.name},#{institution.parentId} )
+        </foreach>
+
+    </insert>
 </mapper>

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 @@
             </if>
             <!-- 游离态标准查询 -->
             <!-- <if test="menuId != null and menuId =='nomenu' and standType =='INLAND'">
-                and SAR_STAND_MENU.MENU_ID = (select SAR_MENU.id from SAR_MENU WHERE parent_id is null and sor_divide
+                and SAR_STAND_MENU.MENU_ID = (select TS_RESOURCE.id from TS_RESOURCE WHERE parent_id is null and sor_divide
                 ='INLAND_STAND')
                 &lt;!&ndash;-查询游离态标准，编号和名称是分开的 &ndash;&gt;
                 <if test="standNumber != null">
@@ -450,7 +450,7 @@
                 </if>
             </if>
             <if test="menuId != null and menuId =='nomenu' and standType =='FOREIGN'">
-                and SAR_STAND_MENU.MENU_ID = (select SAR_MENU.id from SAR_MENU WHERE parent_id is null and sor_divide
+                and SAR_STAND_MENU.MENU_ID = (select TS_RESOURCE.id from TS_RESOURCE WHERE parent_id is null and sor_divide
                 ='FOREIGN_STAND')
                 <if test="standNumber != null">
                     and ((concat(SAR_STANDARDS_INFO.STAND_SORT,' ',SAR_STANDARDS_INFO.STAND_NUMBER,'-',
@@ -462,7 +462,7 @@
             <!--  当第一次进入页面未选择记录时-->
             <!--            <if test="(menuId == null or menuId =='') and standType =='INLAND'">-->
             <!--                and SAR_STAND_MENU.MENU_ID in (-->
-            <!--                select SAR_MENU.id from SAR_MENU start with id=(select SAR_MENU.id from SAR_MENU WHERE parent_id is null-->
+            <!--                select TS_RESOURCE.id from TS_RESOURCE start with id=(select TS_RESOURCE.id from TS_RESOURCE WHERE parent_id is null-->
             <!--                and sor_divide-->
             <!--                ='INLAND_STAND') connect by prior id= parent_id-->
             <!--                )-->
@@ -476,7 +476,7 @@
             </if>
             <!--            <if test="(menuId == null or menuId =='') and standType =='FOREIGN'">-->
             <!--                and SAR_STAND_MENU.MENU_ID in (-->
-            <!--                select SAR_MENU.id from SAR_MENU start with id=(select SAR_MENU.id from SAR_MENU WHERE parent_id is null-->
+            <!--                select TS_RESOURCE.id from TS_RESOURCE start with id=(select TS_RESOURCE.id from TS_RESOURCE WHERE parent_id is null-->
             <!--                and sor_divide-->
             <!--                ='FOREIGN_STAND') connect by prior id= parent_id-->
             <!--                )-->
@@ -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 <include refid="Group_Column_List_Show"/>
     </select>
@@ -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

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

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);
     }
+
+
 }

adc-da-sys/src/main/resources/mybatis/mapper/sys/UserEOMapper.xml

@@ -421,7 +421,7 @@
     </select>
 
     <!-- 根据角色ID获取所有用户 -->
-    <select id="get" resultMap="BaseResultMap" parameterType="java.lang.Integer">
+    <select id="get" resultMap="BaseResultMap" parameterType="java.lang.String">
         select
         <include refid="Base_Column_List"/>
         from TS_USER u