解决冲突

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/config/UserEmpowerInterceptor.java

@@ -9,6 +9,7 @@ import net.sf.jsqlparser.expression.operators.conditional.AndExpression;
 import net.sf.jsqlparser.parser.CCJSqlParserUtil;
 import net.sf.jsqlparser.statement.select.PlainSelect;
 import net.sf.jsqlparser.statement.select.Select;
+import org.apache.commons.lang.ArrayUtils;
 import org.apache.ibatis.executor.Executor;
 import org.apache.ibatis.executor.statement.StatementHandler;
 import org.apache.ibatis.mapping.BoundSql;
@@ -25,10 +26,7 @@ import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
 
 import java.lang.reflect.Method;
 import java.sql.Connection;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Properties;
+import java.util.*;
 
 @Intercepts({@Signature(type = Executor.class, method = "query", args = {MappedStatement.class, Object.class,
         RowBounds.class, ResultHandler.class}), @Signature(type = StatementHandler.class, method = "prepare", args = {Connection.class, Integer.class})})
@@ -140,19 +138,20 @@ public class UserEmpowerInterceptor implements Interceptor {
                     //获取参数值，
                     StdUserEmpower dataAuthRule =(StdUserEmpower) redisUtils.get("Emp_"+RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken()));
                     String[] data = new String[]{String.join(",",dataAuthRule.getAmosOrgCode()),dataAuthRule.getRegionalCompaniesCode(),dataAuthRule.getUserId(),dataAuthRule.getAdminRegionalCompaniesCode()};
+                    List<String> list = new ArrayList<>(Arrays.asList(data));
+                    list.removeAll(Collections.singleton(null));
 
                     BoundSql boundSql = (BoundSql) metaObject.getValue("delegate.boundSql");
-
                     List<String> sq ;
                     //获取sql
                     String sql = boundSql.getSql();
                     List<String> fileds = Arrays.asList(filed);
                     if (!ValidationUtil.isEmpty(dataAuthRule.getAdminRegionalCompaniesCode())) {
-                        sq = selectSqlJXS(new String[]{fileds.get(0), fileds.get(1)}, fileCondition, Arrays.asList(data));
+                        sq = selectSqlJXS(new String[]{fileds.get(0), fileds.get(1)}, fileCondition, list);
                     } else if (!ValidationUtil.isEmpty(dataAuthRule.getUserId())) {
-                        sq = selectSqlJXS(new String[]{fileds.get(0), fileds.get(2)}, fileCondition, Arrays.asList(data));
+                        sq = selectSqlJXS(new String[]{fileds.get(0), fileds.get(2)}, fileCondition, list);
                     } else {
-                        sq = selectSqlJXS(new String[]{fileds.get(0), fileds.get(1)}, fileCondition, Arrays.asList(data));
+                        sq = selectSqlJXS(new String[]{fileds.get(0), fileds.get(1)}, fileCondition, list);
                     }
 
                     String sqldata = " ";

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/mapper/AcceptanceMapper.java

@@ -17,7 +17,7 @@ public interface AcceptanceMapper extends BaseMapper<BaseEntity> {
      * @param acceptanceDto 查询参数
      * @return 分页结果
      */
-    @UserEmpower(field ={"ph.regional_companies_code"} ,fieldConditions ={"in"} ,relationship="and")
+    @UserEmpower(field = {"ph.regional_companies_code"}, dealerField={"ph.developer_code","ph.regional_companies_code","ph.developer_user_id"},fieldConditions = {"in","in","in"}, relationship = "and")
     List<AcceptanceDto> page(
 
             @Param("param") AcceptanceDto acceptanceDto

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/mapper/BasicGridAcceptanceMapper.java

@@ -20,6 +20,6 @@ public interface BasicGridAcceptanceMapper extends BaseMapper<BasicGridAcceptanc
 
 
     PeasantHousehold getStationInfoById(@Param("id") Long id);
-    @UserEmpower(field ={"hph.regional_companies_code"} ,fieldConditions ={"in"} ,relationship="and")
+    @UserEmpower(field ={"hph.regional_companies_code"} ,dealerField={"hph.developer_code","hph.regional_companies_code","hph.developer_user_id"},fieldConditions ={"in","in","in"} ,relationship="and")
     List<BasicGridAcceptanceDto> selectPageList(@Param("map") Map<String, Object> map);
 }

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

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.github.pagehelper.PageHelper;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
+import com.yeejoin.amos.boot.module.hygf.api.config.UserLimits;
 import com.yeejoin.amos.boot.module.hygf.api.dto.AcceptanceDto;
 import com.yeejoin.amos.boot.module.hygf.api.dto.UserUnitInformationDto;
 import com.yeejoin.amos.boot.module.hygf.api.entity.AcceptanceCheckItem;
@@ -33,6 +34,7 @@ public class AcceptanceController  extends BaseController {
     @PostMapping(value = "/page")
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation(httpMethod = "Get", value = "获取验收单列表", notes = "获取验收单列表")
+    @UserLimits
     public ResponseModel<Page<AcceptanceDto>> page(
             @RequestParam(value = "current", required = false, defaultValue = "1") Integer current,
             @RequestParam(value = "size", required = false, defaultValue = "20") Integer size,

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

@@ -122,6 +122,7 @@ public class BasicGridAcceptanceController extends BaseController {
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@GetMapping(value = "/page")
 	@ApiOperation(httpMethod = "GET",value = "分页查询",  notes = "分页查询")
+	@UserLimits
 	public ResponseModel<Page<BasicGridAcceptanceDto>> queryForPage(@RequestParam(value = "current") int current,
 																	@RequestParam(value = "size") int size,
 																	@RequestParam(required = false,value = "projectAddress") String projectAddress,
@@ -130,8 +131,8 @@ public class BasicGridAcceptanceController extends BaseController {
 																	@RequestParam(required = false,value = "gridStatus") String gridStatus,
 																	@RequestParam(required = false,value = "gridConnectionTime") String gridConnectionTime) throws Exception {
         //当前登录人所属场站
-        UserUnitInformationDto userUnitInformationDto=personnelBusinessMapper.getUserUnitInformationDto( getUserInfo().getUserId());
-	    Page<BasicGridAcceptanceDto> page = basicGridAcceptanceServiceImpl.selectPage(userUnitInformationDto.getRegionalCompaniesSeq(),userUnitInformationDto.getAmosDealerId(),current, size, projectAddress, powerStationCode, ownersName, gridStatus, gridConnectionTime, "");
+//        UserUnitInformationDto userUnitInformationDto=personnelBusinessMapper.getUserUnitInformationDto( getUserInfo().getUserId());
+	    Page<BasicGridAcceptanceDto> page = basicGridAcceptanceServiceImpl.selectPage(null,null,current, size, projectAddress, powerStationCode, ownersName, gridStatus, gridConnectionTime, "");
 	    return ResponseHelper.buildResponse(page);
 	}
 

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

+## DB properties:
+spring.datasource.dynamic.primary= mysql-service
+spring.datasource.mysql-service.driver-class-name=com.mysql.cj.jdbc.Driver
+spring.datasource.mysql-service.jdbc-url=jdbc:mysql://172.16.10.220:3306/amos_project?allowMultiQueries=true&serverTimezone=GMT%2B8&characterEncoding=utf8
+spring.datasource.mysql-service.username=root
+spring.datasource.mysql-service.password=Yeejoin@2020
+spring.datasource.mysql-service.type=com.zaxxer.hikari.HikariDataSource
+#最小连接
+spring.datasource.mysql-service.minimum-idle: 5
+#最大连接
+spring.datasource.mysql-service.maximum-pool-size: 15
+#自动提交
+spring.datasource.mysql-service.auto-commit: true
+#最大空闲时常
+spring.datasource.mysql-service.idle-timeout: 30000
+#连接池名
+spring.datasource.mysql-service.pool-name: MysqlDruidCP
+#最大生命周期
+spring.datasource.mysql-service.max-lifetime: 1800000
+#连接超时时间
+spring.datasource.mysql-service.connection-timeout: 30000
+
+
+
+spring.datasource.tdengine-service.driver-class-name=com.taosdata.jdbc.rs.RestfulDriver
+spring.datasource.tdengine-service.jdbc-url=jdbc:TAOS-RS://47.92.234.253:6041/house_pv_data?user=root&password=taosdata&timezone=GMT+8
+spring.datasource.tdengine-service.username=root
+spring.datasource.tdengine-service.password=taosdata
+spring.datasource.tdengine-service.type=com.zaxxer.hikari.HikariDataSource
+#最小连接
+spring.datasource.tdengine-service.minimum-idle: 5
+#最大连接
+spring.datasource.tdengine-service.maximum-pool-size: 15
+#自动提交
+spring.datasource.tdengine-service.auto-commit: true
+#最大空闲时常
+spring.datasource.tdengine-service.idle-timeout: 30000
+#连接池名
+spring.datasource.tdengine-service.pool-name: Data_trans_HikariCP
+#最大生命周期
+spring.datasource.tdengine-service.max-lifetime: 1800000
+#连接超时时间
+spring.datasource.tdengine-service.connection-timeout: 30000
+
+spring.datasource.tdengine-service.connection-test-query: SELECT 1
+
+
+
+
+
+
+## eureka properties:
+eureka.instance.hostname=172.16.10.220
+eureka.client.serviceUrl.defaultZone=http://admin:a1234560@${eureka.instance.hostname}:10001/eureka/
+## redis properties:
+spring.redis.database=1
+spring.redis.host=172.16.10.220
+spring.redis.port=6379
+spring.redis.password=yeejoin@2020
+
+
+spring.cache.type=GENERIC
+j2cache.open-spring-cache=true
+j2cache.cache-clean-mode=passive
+j2cache.allow-null-values=true
+j2cache.redis-client=lettuce
+j2cache.l2-cache-open=true
+j2cache.broadcast=net.oschina.j2cache.cache.support.redis.SpringRedisPubSubPolicy
+j2cache.L1.provider_class=caffeine
+j2cache.L2.provider_class=net.oschina.j2cache.cache.support.redis.SpringRedisProvider
+j2cache.L2.config_section=lettuce
+j2cache.sync_ttl_to_redis=true
+j2cache.default_cache_null_object=false
+j2cache.serialization=fst
+caffeine.properties=/caffeine.properties
+lettuce.mode=single
+lettuce.namespace=
+lettuce.storage=generic
+lettuce.channel=j2cache
+lettuce.scheme=redis
+lettuce.hosts=${spring.redis.host}:${spring.redis.port}
+lettuce.password=${spring.redis.password}
+lettuce.database=${spring.redis.database}
+lettuce.sentinelMasterId=
+lettuce.maxTotal=100
+lettuce.maxIdle=10
+lettuce.minIdle=10
+lettuce.timeout=10000
+
+
+emqx.clean-session=true
+emqx.client-id=${spring.application.name}-${random.int[1024,65536]}
+emqx.broker=tcp://47.92.234.253:1883
+emqx.user-name=admin
+emqx.password=public
+emqx.max-inflight=1000
+
+
+spring.influx.url=http://47.92.234.253:8086
+spring.influx.password=Yeejoin@2020
+spring.influx.user=root
+spring.influx.database=iot_platform
+spring.influx.retention_policy=default
+spring.influx.retention_policy_time=30d
+spring.influx.actions=10000
+spring.influx.bufferLimit=20000
+
+
+knife4j.production=false
+knife4j.enable=true
+knife4j.basic.enable=true
+knife4j.basic.username=admin
+knife4j.basic.password=a1234560
+
+management.security.enabled=true
+spring.security.user.name=admin
+spring.security.user.password=a1234560
+
+fire-rescue=123
+
+mybatis-plus.global-config.db-config.update-strategy=ignored
+
+# user-amos setting : This value is the secretkey for person manage moudle accout password encryption.please don't change it!!!
+amos.secret.key=qaz
+# if your service can't be access ,you can use this setting , you need change ip as your.
+#eureka.instance.prefer-ip-address=true
+#eureka.instance.ip-address=172.16.3.122
+spring.activemq.broker-url=tcp://47.92.234.253:61616
+spring.activemq.user=admin
+spring.activemq.password=admin
+spring.jms.pub-sub-domain=false
+myqueue=amos.privilege.v1.JXIOP.AQSC_FDGL.userBusiness
+
+regulator.unit.code=86*258
+# ������Ӧ��code
+dealer.appcode=studio_normalapp_5133538
+
+hygf.sms.tempCode=SMS_HYGF_0001
+
+# �������������
+sms.huawei.url=https://smsapi.cn-north-4.myhuaweicloud.com:443/sms/batchSendSms/v1
+sms.huawei.appKey=n3FYPWO7Heo1ze212QRBvF4VA2E2
+sms.huawei.appSecret=IFhiMpWROi7w4Ei21ZbfIjKyt97b
+# ģ��id
+sms.huawei.templateId=67931857f6f74e119fadc429bc25a531
+# ǩ��ͨ����
+sms.huawei.sender=1069368924410006092
+# 签名名称
+sms.huawei.signature=江西电建
+
+# 锟斤拷站锟斤拷锟絧ageId
+power.station.examine.pageId=1680853427061551106
+# 锟斤拷站锟斤拷思苹锟絠d
+power.station.examine.planId=c4ed1873-0dc6-4518-a7a9-dbc588ef35e5
+
+
+unitInfo.station.examine.planId=51776087-a9cf-4a87-9a03-24fd24a8cf45
+
+hygf.sms.tempCodeJXS=SMS_HYGF_0002
+
+#工程角色id
+hygf.role.gc.roleSeq=1702550832882413570
+
+# 锟矫伙拷锟斤拷userGroupId
+hygf.user.group.id=1702512164058718210
+
+#锟斤拷锟斤拷司
+regionalCompanies.company.seq=1701778292098498561
+
+
+
+#qiyuesuo.serverUrl = https://openapi.qiyuesuo.cn
+#qiyuesuo.accessKey = a1lcd3WRRV
+#qiyuesuo.accessSecret = haqYIOxTP20ZYiDNEN92GVBa6aoJLu
+#qiyuesuo.secretKey=Fp2LQAqK5gc68hi5
+
+
+qiyuesuo.serverUrl = https://openapi.qiyuesuo.com
+qiyuesuo.accessKey = QcmHQu55pl
+qiyuesuo.accessSecret = em0zvOMRNCAXoD1ePNTL7hGR5KpKUs
+qiyuesuo.secretKey=B6OYbHyfXikAghB2
+
+
+
+# ============================================= v20230821 add properties =============================================
+security.productWeb=AMOS_STUDIO_WEB
+security.appKey=AMOS_STUDIO
+
+login.environment=dev
+# 锟斤拷锟脚╋拷锟轿拷锟叫★拷锟斤拷锟斤拷锟斤拷?
+hygfProgram.appid=wx0a2b054a237a3b34
+hygfProgram.secret=5fc6af660920f6211b1b69bc9c451b09
+# 默锟斤拷微锟斤拷小锟斤拷锟斤拷农锟斤拷锟斤拷锟斤拷锟斤拷
+farmer.orgCode=86
+#农锟斤拷锟斤拷锟斤拷锟斤拷位
+farmer.sequenceNbr=1703583838279593985
+farmer.orgNamesWithoutRole=
+#农锟斤拷锟斤拷色
+farmer.roleId=1702551322030534658
+# 锟斤拷锟矫接匡拷锟斤拷权锟矫伙拷
+platform.access.loginId=hygf_platform
+platform.access.password=AC286A35E74D2DD281EB979789DECF3A
+# 锟斤拷锟斤拷锟矫的撅拷锟斤拷锟斤拷userid
+dealer.userId=
+# 锟斤拷锟皆碉拷时锟斤拷默锟斤拷锟斤拷锟斤拷
+farmer.registerPassword=a123456
+
+#锟斤拷锟斤拷锟教碉拷位锟斤拷锟节碉拷id
+dealer.managementUnitId=1702211822385393665
+#锟斤拷锟斤拷锟教癸拷锟斤拷员锟斤拷色
+dealer.roleId=1702512164058718210
+
+#锟斤拷询锟斤拷锟斤拷锟斤拷锟矫伙拷锟斤拷
+dealer.group=1702511386875158529
+
+#锟斤拷锟矫癸拷锟斤拷锟斤拷探锟斤拷?
+
+dealer.engineering=1702512052154687489
+
+#锟斤拷时锟斤拷锟斤拷锟饺★拷锟斤拷锟斤拷锟较?
+cheduled.crons=0 10 0 * * ?
+
+
+dealer.appcode.manage=studio_normalapp_5155413,studio_normalapp_5133538
+dealer.appcode.role=1767363928842571777
+dealer.amosDealerId=1767820997374775298
\ No newline at end of file