人员管理新增一体化权限字段及增删改查

amos-boot-system-jxiop/amos-boot-module-jxiop-api/src/main/java/com/yeejoin/amos/boot/module/jxiop/api/entity/PersonAccount.java

@@ -123,4 +123,6 @@ public class PersonAccount extends BaseEntity {
     @TableField(exist = false)
     private String phoneNum;
 
+    @TableField(exist = false)
+    private String ythPermission;
 }

amos-boot-system-jxiop/amos-boot-module-jxiop-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/amosprojectmapper/UserEmpowerMapper.java

+package com.yeejoin.amos.boot.module.jxiop.biz.amosprojectmapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+import com.yeejoin.amos.boot.module.jxiop.biz.entity.StdUserEmpower;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.Map;
+
+/**
+ * @description:
+ * @author: tw
+ * @createDate: 2023/11/9
+ */
+public interface UserEmpowerMapper extends BaseMapper<StdUserEmpower> {
+
+}

amos-boot-system-jxiop/amos-boot-module-jxiop-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/config/AmosProjectDbConfig.java

+package com.yeejoin.amos.boot.module.jxiop.biz.config;
+
+import com.alibaba.druid.pool.DruidDataSource;
+import com.baomidou.mybatisplus.extension.spring.MybatisSqlSessionFactoryBean;
+import com.github.pagehelper.PageInterceptor;
+import org.apache.ibatis.plugin.Interceptor;
+import org.apache.ibatis.session.SqlSessionFactory;
+import org.mybatis.spring.annotation.MapperScan;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.core.io.support.PathMatchingResourcePatternResolver;
+import org.springframework.jdbc.datasource.DataSourceTransactionManager;
+
+import javax.sql.DataSource;
+import java.util.Properties;
+@Configuration
+@MapperScan(basePackages  = "com.yeejoin.amos.boot.module.jxiop.biz.amosprojectmapper", sqlSessionFactoryRef = "amosProjectSqlSessionFactory")
+public class AmosProjectDbConfig {
+    private Logger logger = LoggerFactory.getLogger(AmosProjectDbConfig.class);
+    // 精确到 master 目录，以便跟其他数据源隔离
+
+    private static final String MAPPER_LOCATION = "classpath*:mapper/amosproject/*.xml";
+
+    @Value("${spring.db2.datasource.url}")
+    private String dbUrl;
+
+    @Value("${spring.db2.datasource.username}")
+    private String username;
+
+    @Value("${spring.db2.datasource.password}")
+    private String password;
+
+    @Value("${spring.db2.datasource.driver-class-name}")
+    private String driverClassName;
+
+
+    @Bean(name="amosProjectDataSource")   //声明其为Bean实例
+    public DataSource masterDataSource() {
+        DruidDataSource datasource = new DruidDataSource();
+        datasource.setUrl(this.dbUrl);
+        datasource.setUsername(username);
+        datasource.setPassword(password);
+        datasource.setDriverClassName(driverClassName);
+        return datasource;
+    }
+
+    @Bean(name = "amosProjectTransactionManager")
+    public DataSourceTransactionManager masterTransactionManager() {
+        return new DataSourceTransactionManager(masterDataSource());
+    }
+
+    @Bean(name = "amosProjectSqlSessionFactory")
+    public SqlSessionFactory masterSqlSessionFactory(@Qualifier("amosProjectDataSource") DataSource masterDataSource)
+            throws Exception {
+        final MybatisSqlSessionFactoryBean sessionFactory = new MybatisSqlSessionFactoryBean();
+        sessionFactory.setDataSource(masterDataSource);
+        sessionFactory.setMapperLocations(new PathMatchingResourcePatternResolver()
+                .getResources(AmosProjectDbConfig.MAPPER_LOCATION));
+        sessionFactory.setTypeAliasesPackage("com.yeejoin.amos.boot.module.jxiop.biz.entity");
+        //mybatis 数据库字段与实体类属性驼峰映射配置
+        sessionFactory.getObject().getConfiguration().setMapUnderscoreToCamelCase(true);
+
+
+        //分页插件
+        Interceptor interceptor = new PageInterceptor();
+        Properties properties = new Properties();
+        properties.setProperty("helperDialect", "mysql");
+        properties.setProperty("offsetAsPageNum", "true");
+        properties.setProperty("rowBoundsWithCount", "true");
+        properties.setProperty("reasonable", "true");
+        properties.setProperty("supportMethodsArguments","true");
+        properties.setProperty("params","pageNum=pageNum;pageSize=pageSize" +
+                "" +
+                ";");
+        interceptor.setProperties(properties);
+
+
+
+        sessionFactory.setPlugins(new Interceptor[] {interceptor});
+
+        return sessionFactory.getObject();
+    }
+}

amos-boot-system-jxiop/amos-boot-module-jxiop-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/config/MasterDbConfig.java

+package com.yeejoin.amos.boot.module.jxiop.biz.config;
+import com.alibaba.druid.pool.DruidDataSource;
+import com.baomidou.mybatisplus.extension.spring.MybatisSqlSessionFactoryBean;
+import com.github.pagehelper.PageInterceptor;
+import org.apache.ibatis.plugin.Interceptor;
+import org.apache.ibatis.session.SqlSessionFactory;
+import org.mybatis.spring.annotation.MapperScan;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Primary;
+import org.springframework.core.io.support.PathMatchingResourcePatternResolver;
+import org.springframework.jdbc.datasource.DataSourceTransactionManager;
+
+import javax.sql.DataSource;
+import java.util.Properties;
+
+
+@Configuration
+@MapperScan(basePackages  = "com.yeejoin.amos.boot.module.jxiop.api.mapper", sqlSessionFactoryRef = "masterSqlSessionFactory1")
+public class MasterDbConfig {
+    private Logger logger = LoggerFactory.getLogger(MasterDbConfig.class);
+    // 精确到 master 目录，以便跟其他数据源隔离
+
+    private static final String MAPPER_LOCATION = "classpath*:mapper/*.xml";
+
+    @Value("${spring.db1.datasource.url}")
+    private String dbUrl;
+
+    @Value("${spring.db1.datasource.username}")
+    private String username;
+
+    @Value("${spring.db1.datasource.password}")
+    private String password;
+
+    @Value("${spring.db1.datasource.driver-class-name}")
+    private String driverClassName;
+
+
+    @Bean(name="masterDataSource")   //声明其为Bean实例
+    @Primary  //在同样的DataSource中，首先使用被标注的DataSource
+    public DataSource masterDataSource() {
+        DruidDataSource datasource = new DruidDataSource();
+        datasource.setUrl(this.dbUrl);
+        datasource.setUsername(username);
+        datasource.setPassword(password);
+        datasource.setDriverClassName(driverClassName);
+        return datasource;
+    }
+
+    @Bean(name = "masterTransactionManager")
+    @Primary
+    public DataSourceTransactionManager masterTransactionManager() {
+        return new DataSourceTransactionManager(masterDataSource());
+    }
+
+    @Bean(name = "masterSqlSessionFactory1")
+    @Primary
+    public SqlSessionFactory masterSqlSessionFactory(@Qualifier("masterDataSource") DataSource masterDataSource)
+            throws Exception {
+        final MybatisSqlSessionFactoryBean sessionFactory = new MybatisSqlSessionFactoryBean();
+        sessionFactory.setDataSource(masterDataSource);
+        sessionFactory.setMapperLocations(new PathMatchingResourcePatternResolver()
+                .getResources(MasterDbConfig.MAPPER_LOCATION));
+        sessionFactory.setTypeAliasesPackage("com.yeejoin.amos.boot.module.jxiop.api.entity");
+        //mybatis 数据库字段与实体类属性驼峰映射配置
+        sessionFactory.getObject().getConfiguration().setMapUnderscoreToCamelCase(true);
+
+
+        //分页插件
+         Interceptor interceptor = new PageInterceptor();
+         Properties properties = new Properties();
+         properties.setProperty("helperDialect", "mysql");
+         properties.setProperty("offsetAsPageNum", "true");
+         properties.setProperty("rowBoundsWithCount", "true");
+         properties.setProperty("reasonable", "true");
+         properties.setProperty("supportMethodsArguments","true");
+         properties.setProperty("params","pageNum=pageNum;pageSize=pageSize" +
+                 "" +
+                 ";");
+         interceptor.setProperties(properties);
+
+
+
+        sessionFactory.setPlugins(new Interceptor[] {interceptor});
+
+        return sessionFactory.getObject();
+    }
+}

amos-boot-system-jxiop/amos-boot-module-jxiop-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/controller/PrivilegeController.java

@@ -147,6 +147,33 @@ public class PrivilegeController extends BaseController{
         return ResponseHelper.buildResponse(list);
     }
 
+    @TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
+    @GetMapping(value = "/permissionTree")
+    @ApiOperation(httpMethod = "GET",value = "查询所属场站",  notes = "查询所属场站")
+    public ResponseModel<  Collection<CompanyModel>> permissionTree(@RequestParam(required = false,defaultValue = "86*353*328") String orgCode ) {
+        Long companyId =null;
+        if(orgCode!=null){
+            LinkedHashMap<Object, Object> l = (LinkedHashMap<Object, Object>) Privilege.companyClient
+                    .queryByOrgcode(orgCode).getResult();
+            for (Map.Entry<Object, Object> it : l.entrySet()) {
 
+                CompanyModel companyModel = JSONObject.parseObject(JSONObject.toJSONString(it.getValue()),
+                        CompanyModel.class);
+                if (companyModel != null) {
+                    companyId = companyModel.getSequenceNbr();
+                }
+                break;
+            }
+
+        }
+        List<ListCompanyModel> data = new ArrayList();
+        FeignClientResult<Collection<CompanyModel>> de = Privilege.companyClient.querySubAgencyTree(companyId);
+        FeignClientResult<CompanyModel> dat = Privilege.companyClient.seleteOne(companyId);
+        CompanyModel  companyModel=dat.getResult();
+        companyModel.setChildren(de.getResult());
+        List<CompanyModel> list =new ArrayList<>();
+        list.add(companyModel);
+        return ResponseHelper.buildResponse(list);
+    }
 
 }

amos-boot-system-jxiop/amos-boot-module-jxiop-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/entity/StdUserEmpower.java

+package com.yeejoin.amos.boot.module.jxiop.biz.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler;
+import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.util.List;
+
+/**
+ * @description:
+ * @author: tw
+ * @createDate: 2023/11/9
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@TableName(value = "std_user_empower",autoResultMap = true)
+public class StdUserEmpower extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 用户userid
+     */
+    @TableField("amos_user_id")
+    private String amosUserId;
+
+    /**
+     * 单位orgcode
+     */
+    @TableField(value = "amos_org_code",typeHandler = FastjsonTypeHandler.class)
+    private List<String> amosOrgCode;
+
+
+
+    /**
+     * 权限类型
+     */
+    @TableField("permission_type")
+    private String permissionType;
+
+}

amos-boot-system-jxiop/amos-boot-module-jxiop-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/service/impl/PersonBasicServiceImpl.java

@@ -23,6 +23,8 @@ import com.yeejoin.amos.boot.module.jxiop.api.mapper.PersonBasicMapper;
 import com.yeejoin.amos.boot.module.jxiop.api.service.IPersonBasicService;
 import com.yeejoin.amos.boot.module.jxiop.api.util.Constants;
 import com.yeejoin.amos.boot.module.jxiop.biz.activemq.QuerueProduce;
+import com.yeejoin.amos.boot.module.jxiop.biz.amosprojectmapper.UserEmpowerMapper;
+import com.yeejoin.amos.boot.module.jxiop.biz.entity.StdUserEmpower;
 import com.yeejoin.amos.component.feign.model.FeignClientResult;
 import com.yeejoin.amos.feign.privilege.Privilege;
 import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
@@ -97,6 +99,9 @@ public class PersonBasicServiceImpl extends BaseService<PersonBasicDto, PersonBa
     @Autowired
     private AgencyuserFeign agencyuserFeign;
 
+    @Autowired
+    private UserEmpowerMapper userEmpowerMapper;
+
     /**
      * 人员赋码触发风险模型
      */
@@ -358,7 +363,13 @@ public class PersonBasicServiceImpl extends BaseService<PersonBasicDto, PersonBa
         personAccount.setProjectName(companyModel.getCompanyName());
 //        this.personBasicMapper.updateById(personBasic);
         this.personAccountService.updateById(personAccount);
-
+        //----------------------------权限表中新增数据-----------------------------
+        StdUserEmpower stdUserEmpower = new StdUserEmpower();
+        stdUserEmpower.setPermissionType("YTH");
+        stdUserEmpower.setAmosOrgCode(Arrays.asList(personAccount.getYthPermission()));
+        stdUserEmpower.setAmosUserId(personAccount.getPuserId());
+        userEmpowerMapper.insert(stdUserEmpower);
+        //----------------------------权限表中新增数据-----------------------------
         PersonAccountFed personAccountFed = new PersonAccountFed();
         BeanUtils.copyProperties(personAccount, personAccountFed);
         personAccountFed.setSyncState(0);
@@ -587,6 +598,17 @@ public class PersonBasicServiceImpl extends BaseService<PersonBasicDto, PersonBa
         } else {
             this.personBasicMapper.updateById(personBasic);
         }
+        StdUserEmpower stdUserEmpower = userEmpowerMapper.selectOne(new QueryWrapper<StdUserEmpower>().eq("amos_user_id", personAccount.getPuserId()).eq("permission_type", "YTH"));
+        if(ObjectUtils.isEmpty(stdUserEmpower)){
+            stdUserEmpower = new StdUserEmpower();
+            stdUserEmpower.setPermissionType("YTH");
+            stdUserEmpower.setAmosOrgCode(Arrays.asList(personAccount.getYthPermission()));
+            stdUserEmpower.setAmosUserId(personAccount.getPuserId());
+            userEmpowerMapper.insert(stdUserEmpower);
+        }else {
+            stdUserEmpower.setAmosOrgCode(Arrays.asList(personAccount.getYthPermission()));
+            userEmpowerMapper.updateById(stdUserEmpower);
+        }
         personAccountService.updateById(personAccount);
 
         PersonAccountFed personAccountFed = new PersonAccountFed();
@@ -641,6 +663,10 @@ public class PersonBasicServiceImpl extends BaseService<PersonBasicDto, PersonBa
         if (personBasic.getNativePlace() != null) {
             personUser.setNativePlace(JSON.parseArray(personBasic.getNativePlace(), Integer.class));
         }
+        StdUserEmpower stdUserEmpower = userEmpowerMapper.selectOne(new QueryWrapper<StdUserEmpower>().eq("amos_user_id", personAccount.getPuserId()).eq("permission_type", "YTH"));
+        if(!ObjectUtils.isEmpty(stdUserEmpower)){
+            personAccount.setYthPermission(stdUserEmpower.getAmosOrgCode().get(0));
+        }
         personDto.setPersonUser(personUser);
         personDto.setPersonCertificate(certificationInfo);
         personDto.setPersonAccount(personAccount);
@@ -668,7 +694,7 @@ public class PersonBasicServiceImpl extends BaseService<PersonBasicDto, PersonBa
         QueryWrapper<PersonAccountFed> wrapper1 = new QueryWrapper();
         wrapper1.in("person_id",ids);
         personAccountFedMapper.delete(wrapper1);
-
+        userEmpowerMapper.delete(new QueryWrapper<StdUserEmpower>().in("amos_user_id", userid).eq("permission_type", "YTH"));
         return deleteResult;
     }
 

amos-boot-system-jxiop/amos-boot-module-jxiop-biz/src/main/resources/application-dev.properties

 ## DB properties:
-spring.datasource.url=jdbc:mysql://172.16.10.220:3306/production?allowMultiQueries=true&serverTimezone=GMT%2B8&characterEncoding=utf8
-spring.datasource.username=root
-spring.datasource.password=Yeejoin@2020
+spring.db1.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
+spring.db1.datasource.url=jdbc:mysql://139.9.173.44:3306/production?allowMultiQueries=true&serverTimezone=GMT%2B8&characterEncoding=utf8
+spring.db1.datasource.username=root
+spring.db1.datasource.password=Yeejoin@2020
+
+spring.db2.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
+spring.db2.datasource.url=jdbc:mysql://139.9.173.44:3306/amos_project?allowMultiQueries=true&serverTimezone=GMT%2B8&characterEncoding=utf8
+spring.db2.datasource.username=root
+spring.db2.datasource.password=Yeejoin@2020
+
 ## eureka properties:
 eureka.instance.hostname=172.16.10.220
 eureka.client.serviceUrl.defaultZone=http://admin:a1234560@${eureka.instance.hostname}:10001/eureka/
@@ -80,7 +87,7 @@ amos.secret.key=qaz
 #eureka.instance.ip-address=172.16.3.122
 
 
-spring.activemq.broker-url=tcp://172.16.10.253:61616
+spring.activemq.broker-url=tcp://172.16.10.220:61616
 spring.activemq.user=admin
 spring.activemq.password=admin
 spring.jms.pub-sub-domain=false

amos-boot-system-jxiop/amos-boot-module-jxiop-biz/src/main/resources/application.properties

-spring.application.name=AMOS-JXIOP
+spring.application.name=AMOS-JXIOP-CT
 server.servlet.context-path=/jxiop
 server.port=33100
 server.uri-encoding=UTF-8

amos-boot-system-jxiop/amos-boot-module-jxiop-monitor-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/service/impl/MonitorFanIndicatorImpl.java

@@ -304,7 +304,7 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator {
 		String companyLevel ="";
 		StdUserEmpower stdUserEmpower = userEmpowerMapper.selectOne(new QueryWrapper<StdUserEmpower>().eq("amos_user_id", userId).eq("permission_type", "YTH"));
 		if (ObjectUtils.isEmpty(stdUserEmpower)) {
-			throw new BadRequest("您当前未配置数据权限！");
+//			throw new BadRequest("您当前未配置数据权限！");
 		}else{
 			String permissionOrgCode = stdUserEmpower.getAmosOrgCode().get(0);
 			Map<String,String>  companyInfo= userEmpowerMapper.getCompanyInfoByOrgCode(permissionOrgCode);
@@ -350,15 +350,15 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator {
 		gfzTreeDto.setChildren(gfz);
 		List<TreeDto> treeDtos = Arrays.asList(fdzTreeDto, gfzTreeDto);
 		treeDto.setChildren(treeDtos);
-		if(companyLevel.equals("station")){
-			List<TreeDto> children = stationListByRegionCode.stream().filter(t->t.getCode().equals(sequenceNbr)).collect(Collectors.toList());
-			if(stationBasic.getStationType().equals("FDZ")){
-				treeDto =  fdzTreeDto;
-			}else {
-				treeDto = gfzTreeDto;
-			}
-			treeDto.setChildren(children);
-		}
+//		if(companyLevel.equals("station")){
+//			List<TreeDto> children = stationListByRegionCode.stream().filter(t->t.getCode().equals(sequenceNbr)).collect(Collectors.toList());
+//			if(stationBasic.getStationType().equals("FDZ")){
+//				treeDto =  fdzTreeDto;
+//			}else {
+//				treeDto = gfzTreeDto;
+//			}
+//			treeDto.setChildren(children);
+//		}
 		return treeDto;
 	}