户用光伏去除seata框架

amos-boot-system-jxiop/amos-boot-module-hygf-biz/pom.xml

@@ -67,35 +67,35 @@
           <version>1.10.4</version>
           <scope>compile</scope>
       </dependency>
-      <dependency>
-          <groupId>io.github.openfeign</groupId>
-          <artifactId>feign-httpclient</artifactId>
-      </dependency>
-      <dependency>
-          <groupId>com.esotericsoftware.kryo</groupId>
-          <artifactId>kryo</artifactId>
-          <version>2.24.0</version>
-      </dependency>
-      <dependency>
-          <groupId>de.javakaffee</groupId>
-          <artifactId>kryo-serializers</artifactId>
-          <version>0.45</version>
-      </dependency>
-      <dependency>
-          <groupId>com.esotericsoftware</groupId>
-          <artifactId>kryo</artifactId>
-          <version>4.0.2</version>
-      </dependency>
-      <dependency>
-          <groupId>cn.com.vastdata</groupId>
-          <artifactId>vastbase-jdbc</artifactId>
-          <version>2.7p</version>
-      </dependency>
-      <dependency>
-          <groupId>io.seata</groupId>
-          <artifactId>seata-spring-boot-starter</artifactId>
-          <version>1.8.0</version>
-      </dependency>
+<!--      <dependency>-->
+<!--          <groupId>io.github.openfeign</groupId>-->
+<!--          <artifactId>feign-httpclient</artifactId>-->
+<!--      </dependency>-->
+<!--      <dependency>-->
+<!--          <groupId>com.esotericsoftware.kryo</groupId>-->
+<!--          <artifactId>kryo</artifactId>-->
+<!--          <version>2.24.0</version>-->
+<!--      </dependency>-->
+<!--      <dependency>-->
+<!--          <groupId>de.javakaffee</groupId>-->
+<!--          <artifactId>kryo-serializers</artifactId>-->
+<!--          <version>0.45</version>-->
+<!--      </dependency>-->
+<!--      <dependency>-->
+<!--          <groupId>com.esotericsoftware</groupId>-->
+<!--          <artifactId>kryo</artifactId>-->
+<!--          <version>4.0.2</version>-->
+<!--      </dependency>-->
+<!--      <dependency>-->
+<!--          <groupId>cn.com.vastdata</groupId>-->
+<!--          <artifactId>vastbase-jdbc</artifactId>-->
+<!--          <version>2.7p</version>-->
+<!--      </dependency>-->
+<!--      <dependency>-->
+<!--          <groupId>io.seata</groupId>-->
+<!--          <artifactId>seata-spring-boot-starter</artifactId>-->
+<!--          <version>1.8.0</version>-->
+<!--      </dependency>-->
 
       <!-- ICBC工行支付 -->
       <dependency>

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

+//package com.yeejoin.amos.boot.module.hygf.biz.config;
+//
+//
+//import com.baomidou.mybatisplus.core.config.GlobalConfig;
+//import com.baomidou.mybatisplus.extension.plugins.PaginationInterceptor;
+//import com.baomidou.mybatisplus.extension.spring.MybatisSqlSessionFactoryBean;
+//import com.github.pagehelper.PageInterceptor;
+//import com.yeejoin.amos.boot.biz.config.MetaHandler;
+//import com.yeejoin.amos.boot.module.hygf.api.config.UserEmpowerInterceptor;
+//import io.seata.rm.datasource.DataSourceProxy;
+//import org.apache.ibatis.plugin.Interceptor;
+//import org.apache.ibatis.session.SqlSessionFactory;
+//import org.mybatis.spring.SqlSessionTemplate;
+//import org.mybatis.spring.annotation.MapperScan;
+//import org.springframework.beans.factory.annotation.Autowired;
+//import org.springframework.beans.factory.annotation.Qualifier;
+//import org.springframework.boot.context.properties.ConfigurationProperties;
+//import org.springframework.boot.jdbc.DataSourceBuilder;
+//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;
+//
+//
+///**
+// * mysql配置类
+// * @author zhengwen
+// */
+//@Configuration
+//@MapperScan(basePackages = {"com.yeejoin.amos.boot.module.hygf.api.mapper"}, sqlSessionTemplateRef  = "mysqlSqlSessionTemplate")
+//public class MysqlServerConfig {
+//
+//    @Autowired
+//    MetaHandler metaHandler;
+//    private static final String MAPPER_LOCATION = "classpath*:mapper/mysql/*.xml";
+//    @Bean(name = "mysqlDataSource")
+//    @ConfigurationProperties(prefix = "spring.datasource.mysql-service")
+//    @Primary
+//    public DataSource mysqlDataSource() {
+//        return DataSourceBuilder.create().build();
+//    }
+//
+//    @Bean("mysqlDataSourceProxy")
+//    public DataSourceProxy dataSourceProxy(@Qualifier("mysqlDataSource") DataSource hikariDataSource) {
+//        return new DataSourceProxy(hikariDataSource);
+//    }
+//
+//    @Bean(name = "mysqlSqlSessionFactory")
+//    @Primary
+//    public SqlSessionFactory mysqlSqlSessionFactory(@Qualifier("mysqlDataSourceProxy") DataSource dataSource, GlobalConfig globalConfig) throws Exception {
+//        //注意这里一定要用MybatisSqlSessionFactoryBean，如果用SqlSessionFactory，配置无效
+//        MybatisSqlSessionFactoryBean bean = new MybatisSqlSessionFactoryBean();
+//        bean.setDataSource(dataSource);
+//        bean.setMapperLocations(new PathMatchingResourcePatternResolver().getResources(MAPPER_LOCATION));
+//        globalConfig.setMetaObjectHandler(metaHandler);
+//        bean.setGlobalConfig(globalConfig);
+//        //分页插件
+//        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=current;pageSize=size" +
+//                "" +
+//                ";");
+//        interceptor.setProperties(properties);
+//        bean.setPlugins(new Interceptor[] {interceptor,
+//                userEmpowerInterceptor(),
+//                paginationInterceptor()
+//        });
+//        return bean.getObject();
+//    }
+//
+//    @Bean(name = "mysqlTransactionManager")
+//    @Primary
+//    public DataSourceTransactionManager mysqlTransactionManager(@Qualifier("mysqlDataSource") DataSource dataSource) {
+//        return new DataSourceTransactionManager(dataSource);
+//    }
+//
+//    @Bean(name = "mysqlSqlSessionTemplate")
+//    @Primary
+//    public SqlSessionTemplate mysqlSqlSessionTemplate(@Qualifier("mysqlSqlSessionFactory") SqlSessionFactory sqlSessionFactory) throws Exception {
+//        return new SqlSessionTemplate(sqlSessionFactory);
+//    }
+//
+//    @Bean
+//    public PaginationInterceptor paginationInterceptor() {
+//        PaginationInterceptor paginationInterceptor = new PaginationInterceptor();
+//        paginationInterceptor.setDialectType("mysql");
+//        return paginationInterceptor;
+//    }
+//
+//
+//    @Bean
+//    public UserEmpowerInterceptor userEmpowerInterceptor() {
+//        UserEmpowerInterceptor userEmpowerInterceptor = new UserEmpowerInterceptor();
+//
+//        return userEmpowerInterceptor;
+//    }
+//
+//
+//}
 package com.yeejoin.amos.boot.module.hygf.biz.config;
 
 
@@ -7,7 +115,6 @@ import com.baomidou.mybatisplus.extension.spring.MybatisSqlSessionFactoryBean;
 import com.github.pagehelper.PageInterceptor;
 import com.yeejoin.amos.boot.biz.config.MetaHandler;
 import com.yeejoin.amos.boot.module.hygf.api.config.UserEmpowerInterceptor;
-import io.seata.rm.datasource.DataSourceProxy;
 import org.apache.ibatis.plugin.Interceptor;
 import org.apache.ibatis.session.SqlSessionFactory;
 import org.mybatis.spring.SqlSessionTemplate;
@@ -44,18 +151,16 @@ public class MysqlServerConfig {
         return DataSourceBuilder.create().build();
     }
 
-    @Bean("mysqlDataSourceProxy")
-    public DataSourceProxy dataSourceProxy(@Qualifier("mysqlDataSource") DataSource hikariDataSource) {
-        return new DataSourceProxy(hikariDataSource);
-    }
 
     @Bean(name = "mysqlSqlSessionFactory")
     @Primary
-    public SqlSessionFactory mysqlSqlSessionFactory(@Qualifier("mysqlDataSourceProxy") DataSource dataSource, GlobalConfig globalConfig) throws Exception {
+    public SqlSessionFactory mysqlSqlSessionFactory(@Qualifier("mysqlDataSource") DataSource dataSource, GlobalConfig globalConfig) throws Exception {
         //注意这里一定要用MybatisSqlSessionFactoryBean，如果用SqlSessionFactory，配置无效
         MybatisSqlSessionFactoryBean bean = new MybatisSqlSessionFactoryBean();
         bean.setDataSource(dataSource);
         bean.setMapperLocations(new PathMatchingResourcePatternResolver().getResources(MAPPER_LOCATION));
+
+
         globalConfig.setMetaObjectHandler(metaHandler);
         bean.setGlobalConfig(globalConfig);
         //分页插件
@@ -70,7 +175,10 @@ public class MysqlServerConfig {
                 "" +
                 ";");
         interceptor.setProperties(properties);
+
+
         bean.setPlugins(new Interceptor[] {interceptor,
+                paginationInterceptor(),
                 userEmpowerInterceptor(),
                 paginationInterceptor()
         });
@@ -105,4 +213,4 @@ public class MysqlServerConfig {
     }
 
 
-}
+}
\ No newline at end of file

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

@@ -5,8 +5,8 @@ import cn.hutool.core.map.MapBuilder;
 import com.alibaba.fastjson.JSON;
 import com.yeejoin.amos.boot.module.hygf.api.util.CommonResponseNewUtil;
 import com.yeejoin.amos.boot.module.hygf.api.util.CommonResponseUtil;
-import io.seata.spring.annotation.GlobalTransactional;
 import org.springframework.beans.BeanUtils;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.RequestMapping;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.Api;
@@ -48,7 +48,7 @@ public class FinancingInfoController extends BaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
 	@PostMapping(value = "/save")
 	@ApiOperation(httpMethod = "POST", value = "新增", notes = "新增")
-	@GlobalTransactional
+	@Transactional
 	public ResponseModel<FinancingInfoDto> save(@RequestBody FinancingInfoDto model) {
 	    model = financingInfoServiceImpl.saveModel(model);
 	    return ResponseHelper.buildResponse(model);
@@ -63,7 +63,7 @@ public class FinancingInfoController extends BaseController {
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@PutMapping(value = "/{sequenceNbr}")
 	@ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新", notes = "根据sequenceNbr更新")
-	@GlobalTransactional
+	@Transactional
 	public ResponseModel<FinancingInfoDto> updateBySequenceNbrFinancingInfo(@RequestBody FinancingInfoDto model,@PathVariable(value = "sequenceNbr") Long sequenceNbr) {
 	    model.setSequenceNbr(sequenceNbr);
 		model.setFile(JSON.toJSONString(model.getFiles()));
@@ -147,7 +147,7 @@ public class FinancingInfoController extends BaseController {
 
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@ApiOperation(httpMethod = "GET",value = "撤回",   notes = "撤回")
-	@GlobalTransactional
+	@Transactional
 	@GetMapping(value = "/rollback")
 	public ResponseModel rollback(String instanceId,String peasantHouseholdId) {
 		 financingInfoServiceImpl.rollback(instanceId,peasantHouseholdId);
@@ -158,7 +158,7 @@ public class FinancingInfoController extends BaseController {
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@ApiOperation(httpMethod = "POST",value = "审核",   notes = "审核")
 	@PostMapping(value = "/execueFlow")
-	@GlobalTransactional
+	@Transactional
 	public ResponseModel execueFlow(@RequestBody Map<String, Object> params) {
 		financingInfoServiceImpl.execueFlow(params);
 		return CommonResponseNewUtil.success();

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

@@ -6,10 +6,10 @@ import com.yeejoin.amos.boot.module.hygf.api.config.UserLimits;
 import com.yeejoin.amos.boot.module.hygf.api.dto.PowerStationDto;
 import com.yeejoin.amos.boot.module.hygf.biz.service.impl.PowerStationServiceImpl;
 import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
-import io.seata.spring.annotation.GlobalTransactional;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 import org.typroject.tyboot.core.foundation.enumeration.UserType;
 import org.typroject.tyboot.core.restful.doc.TycloudOperation;
@@ -132,7 +132,7 @@ public class PowerStationController extends BaseController {
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@ApiOperation(httpMethod = "POST",value = "电站审核",   notes = "电站审核")
 	@PostMapping(value = "/powerStationExamine")
-	@GlobalTransactional
+	@Transactional
 	public ResponseModel<String> powerStationExamine(@RequestParam(value = "pageId") long pageId,
 														 			@RequestParam(value = "nodeCode") String nodeCode,
 													 				@RequestParam(value = "stationId") String stationId,

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

@@ -19,11 +19,11 @@ import com.yeejoin.amos.boot.module.hygf.biz.service.impl.DesignInformationServi
 import com.yeejoin.amos.boot.module.hygf.biz.service.impl.HygfReplenishmentServiceImpl;
 import com.yeejoin.amos.boot.module.hygf.biz.service.impl.PreparationMoneyServiceImpl;
 import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
-import io.seata.spring.annotation.GlobalTransactional;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 import org.typroject.tyboot.core.foundation.enumeration.UserType;
 import org.typroject.tyboot.core.restful.doc.TycloudOperation;
@@ -69,7 +69,7 @@ public class PreparationMoneyController extends BaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
 	@PostMapping(value = "/save")
 	@ApiOperation(httpMethod = "POST", value = "新增发货单", notes = "新增发货单")
-	@GlobalTransactional
+	@Transactional
 	@UserLimits
 	public ResponseModel<PreparationMoney> save( @RequestParam("isSubmit") String isSubmit, @RequestBody PreparationMoney model) {
         AgencyUserModel agencyUserModel= getUserInfo();
@@ -257,7 +257,7 @@ public class PreparationMoneyController extends BaseController {
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@PostMapping(value = "/uploadVoucher")
 	@ApiOperation(httpMethod = "POST",value = "上传收获凭证",  notes = "上传收获凭证")
-	@GlobalTransactional
+	@Transactional
 	public ResponseModel uploadVoucher(@RequestParam(value = "instanceId",required = false) String instanceId,@RequestBody PreparationMoney model, String isSubmit) {
 
 		preparationMoneyServiceImpl.uploadVoucher(model,instanceId,isSubmit);
@@ -267,7 +267,7 @@ public class PreparationMoneyController extends BaseController {
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@PostMapping(value = "/excuteFlow")
 	@ApiOperation(httpMethod = "POST",value = "收货审核",  notes = "收货审核")
-	@GlobalTransactional
+	@Transactional
 	public ResponseModel excuteFlow(@RequestParam(value = "instanceId" ,required = false) String instanceId,
 									@RequestParam(value = "sequenceNbr") Long sequenceNbr,@RequestBody Map<String, Object> kv) {
 
@@ -278,7 +278,7 @@ public class PreparationMoneyController extends BaseController {
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@PostMapping(value = "/replenishmentSubmit")
 	@ApiOperation(httpMethod = "POST",value = "补货申请",  notes = "补货申请")
-	@GlobalTransactional
+	@Transactional
 	public ResponseModel replenishmentSubmit( @RequestBody HygfReplenishment hygfReplenishment) {
 //		HygfReplenishment hygfReplenishment1 = new HygfReplenishment();
 //		BeanUtils.copyProperties(hygfReplenishment,hygfReplenishment1);
@@ -302,7 +302,7 @@ public class PreparationMoneyController extends BaseController {
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@PostMapping(value = "/replenishmentAudit")
 	@ApiOperation(httpMethod = "POST",value = "补货审核",  notes = "补货审核")
-	@GlobalTransactional
+	@Transactional
 	public ResponseModel  replenishmentAudit(@RequestParam(value = "sequenceNbr") Long sequenceNbr,@RequestBody Map<String,Object> kv) {
 		preparationMoneyServiceImpl.replenishmentAudit(sequenceNbr,kv);
 		return CommonResponseNewUtil.success();
@@ -311,7 +311,7 @@ public class PreparationMoneyController extends BaseController {
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@PostMapping(value = "/submitOrder")
 	@ApiOperation(httpMethod = "POST",value = "补货审核",  notes = "补货审核")
-	@GlobalTransactional
+	@Transactional
 	public ResponseModel  submitOrder(@RequestParam(value = "instanceId") String instanceId,
 									  @RequestParam(value = "isSubmit") String isSubmit,
 									  @RequestBody PreparationMoney model) {

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

@@ -25,7 +25,6 @@ import com.yeejoin.amos.feign.privilege.model.CompanyModel;
 import com.yeejoin.amos.feign.privilege.model.GroupModel;
 import com.yeejoin.amos.feign.systemctl.Systemctl;
 import com.yeejoin.amos.feign.systemctl.model.RegionModel;
-import io.seata.spring.annotation.GlobalTransactional;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -33,6 +32,7 @@ import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.http.HttpStatus;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;
@@ -262,7 +262,7 @@ public class UnitInfoController extends BaseController {
 	@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
 	@PostMapping(value = "/unitRegister")
 	@ApiOperation(httpMethod = "POST", value = "单位注册", notes = "单位注册")
-    @GlobalTransactional
+    @Transactional
 	public ResponseModel<UnitRegisterDto> save(@RequestBody UnitRegisterDto model) {
 		try {
 

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/feign/TaskV2FeignService.java

 package com.yeejoin.amos.boot.module.hygf.biz.feign;
 
+import com.yeejoin.amos.boot.biz.common.feign.MultipartSupportConfig;
 import com.yeejoin.amos.component.feign.config.InnerInvokException;
 import com.yeejoin.amos.component.feign.model.FeignClientResult;
 import com.yeejoin.amos.feign.systemctl.model.TaskV2Model;
@@ -16,7 +17,8 @@ import java.util.List;
  * @apiNote 待办Feign调用
  * @date 2024-05-16
  */
-@FeignClient(name = "AMOS-API-PRIVILEGE", path = "/systemctl/v2/task", configuration = {XidFeignConfiguration.class})
+//@FeignClient(name = "AMOS-API-PRIVILEGE", path = "/systemctl/v2/task", configuration = {XidFeignConfiguration.class})
+@FeignClient(name = "AMOS-API-PRIVILEGE", path = "/systemctl/v2/task", configuration = {MultipartSupportConfig.class})
 public interface TaskV2FeignService {
 
     /**

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/feign/WorkFlowFeignService.java

 package com.yeejoin.amos.boot.module.hygf.biz.feign;
 
 import com.alibaba.fastjson.JSONObject;
+import com.yeejoin.amos.boot.biz.common.feign.MultipartSupportConfig;
 import com.yeejoin.amos.component.feign.model.FeignClientResult;
 import com.yeejoin.amos.feign.workflow.model.*;
 import org.springframework.cloud.openfeign.FeignClient;
@@ -8,7 +9,7 @@ import org.springframework.web.bind.annotation.*;
 import java.util.List;
 import java.util.Map;
 
-@FeignClient(name = "${workflow.feign.name}", path = "workflow", configuration = {XidFeignConfiguration.class})
+@FeignClient(name = "${workflow.feign.name}", path = "workflow", configuration = {MultipartSupportConfig.class})
 public interface WorkFlowFeignService {
 
     /***

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/feign/WorkflowFeignClient.java

@@ -11,8 +11,8 @@ import org.springframework.web.bind.annotation.*;
 import java.util.List;
 import java.util.Map;
 
-
-@FeignClient(name = "${workflow.feign.name:AMOS-API-WORKFLOW}", path = "workflow", configuration = {XidFeignConfiguration.class})
+@FeignClient(name = "${workflow.feign.name:AMOS-API-WORKFLOW}", path = "workflow", configuration = {MultipartSupportConfig.class})
+//@FeignClient(name = "${workflow.feign.name:AMOS-API-WORKFLOW}", path = "workflow", configuration = {XidFeignConfiguration.class})
 public interface WorkflowFeignClient {
 
     /***

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/feign/XidFeignConfiguration.java

-package com.yeejoin.amos.boot.module.hygf.biz.feign;
-
-import feign.RequestInterceptor;
-import feign.RequestTemplate;
-import feign.codec.Encoder;
-import feign.form.spring.SpringFormEncoder;
-import io.seata.core.context.RootContext;
-import org.springframework.beans.factory.ObjectFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.http.HttpMessageConverters;
-import org.springframework.cloud.openfeign.support.SpringEncoder;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.util.StringUtils;
-import org.springframework.web.context.request.RequestContextListener;
-
-@Configuration
-public class XidFeignConfiguration implements RequestInterceptor {
-    @Autowired
-    private ObjectFactory<HttpMessageConverters> messageConverters;
-
-    @Bean
-    public Encoder feignFormEncoder() {
-        return new SpringFormEncoder(new SpringEncoder(messageConverters));
-    }
-    /**
-     * 创建Feign请求拦截器，在发送请求前设置认证的token,各个微服务将token设置到环境变量中来达到通用
-     * @return
-     */
-    @Bean
-    public RequestContextListener requestInterceptor() {
-        return new RequestContextListener();
-    }
-
-    @Override
-    public void apply(RequestTemplate template) {
-        String xid = RootContext.getXID();
-        if(StringUtils.hasText(xid)){
-            template.header(RootContext.KEY_XID, xid);
-        }
-    }
-}
+//package com.yeejoin.amos.boot.module.hygf.biz.feign;
+//
+//import feign.RequestInterceptor;
+//import feign.RequestTemplate;
+//import feign.codec.Encoder;
+//import feign.form.spring.SpringFormEncoder;
+//import io.seata.core.context.RootContext;
+//import org.springframework.beans.factory.ObjectFactory;
+//import org.springframework.beans.factory.annotation.Autowired;
+//import org.springframework.boot.autoconfigure.http.HttpMessageConverters;
+//import org.springframework.cloud.openfeign.support.SpringEncoder;
+//import org.springframework.context.annotation.Bean;
+//import org.springframework.context.annotation.Configuration;
+//import org.springframework.util.StringUtils;
+//import org.springframework.web.context.request.RequestContextListener;
+//
+//@Configuration
+//public class XidFeignConfiguration implements RequestInterceptor {
+//    @Autowired
+//    private ObjectFactory<HttpMessageConverters> messageConverters;
+//
+//    @Bean
+//    public Encoder feignFormEncoder() {
+//        return new SpringFormEncoder(new SpringEncoder(messageConverters));
+//    }
+//    /**
+//     * 创建Feign请求拦截器，在发送请求前设置认证的token,各个微服务将token设置到环境变量中来达到通用
+//     * @return
+//     */
+//    @Bean
+//    public RequestContextListener requestInterceptor() {
+//        return new RequestContextListener();
+//    }
+//
+//    @Override
+//    public void apply(RequestTemplate template) {
+//        String xid = RootContext.getXID();
+//        if(StringUtils.hasText(xid)){
+//            template.header(RootContext.KEY_XID, xid);
+//        }
+//    }
+//}
\ No newline at end of file

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

@@ -20,11 +20,11 @@ import com.yeejoin.amos.boot.module.hygf.api.service.IAcceptanceRectificationOrd
 import com.yeejoin.amos.boot.module.hygf.api.util.RedisLockUtil;
 import com.yeejoin.amos.component.robot.BadRequest;
 import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
-import io.seata.spring.annotation.GlobalTransactional;
 import org.apache.commons.lang3.BooleanUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 import org.typroject.tyboot.core.foundation.context.RequestContext;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
 
@@ -103,7 +103,7 @@ public class AcceptanceRectificationOrderServiceImpl extends BaseService<Accepta
      * 提交整改并触发工作流
      */
 
-    @GlobalTransactional
+    @Transactional
     public AcceptanceRectificationOrderDto updateAndDriveWorkflow(AcceptanceRectificationOrderDto model, String userId) {
         ReginParams reginParams = JSONObject.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
 

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

@@ -19,11 +19,11 @@ import com.yeejoin.amos.boot.module.hygf.api.mapper.PeasantHouseholdMapper;
 import com.yeejoin.amos.boot.module.hygf.api.service.IAcceptanceService;
 import com.yeejoin.amos.boot.module.hygf.api.util.RedisLockUtil;
 import com.yeejoin.amos.component.robot.BadRequest;
-import io.seata.spring.annotation.GlobalTransactional;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.BooleanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.Assert;
 import org.springframework.util.StringUtils;
 
@@ -115,7 +115,7 @@ public class AcceptanceServiceImpl implements IAcceptanceService {
         return Optional.ofNullable(item).orElse(new AcceptanceCheckItem());
     }
     @Override
-    @GlobalTransactional
+    @Transactional
     public void checkAccept(Long basicGridAcceptanceId, String userId) {
         String lockName = String.format("LockName:checkAccept:%s", basicGridAcceptanceId);
         Boolean isLocked = redisLockUtil.tryLock(lockName, lockName, 10, 1);

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

@@ -13,7 +13,6 @@ import com.yeejoin.amos.boot.module.hygf.api.service.IBasicGridAcceptanceService
 import com.yeejoin.amos.boot.module.hygf.api.util.NumberUtil;
 import com.yeejoin.amos.boot.module.hygf.api.util.RedisLockUtil;
 import com.yeejoin.amos.component.robot.BadRequest;
-import io.seata.spring.annotation.GlobalTransactional;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.BooleanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -94,7 +93,7 @@ public class BasicGridAcceptanceServiceImpl
 		return grid;
 	}
 
-	@GlobalTransactional
+	@Transactional
 	public synchronized HygfOnGrid saveAndCommit(HygfOnGrid grid, String userId) {
 
 		BasicGridAcceptance basicGridAcceptance = basicGridAcceptanceMapper
@@ -202,7 +201,7 @@ public class BasicGridAcceptanceServiceImpl
 		return bool;
 	}
 
-	@GlobalTransactional
+	@Transactional
 	public void execute(AcceptanceCheckItem dto, String userId) {
 		String lockName = String.format("LockName:executeWorkflow:%s", dto.getBasicGridAcceptanceId());
 		Boolean isLocked = redisLockUtil.tryLock(lockName, lockName, 10, 1);

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

@@ -35,7 +35,6 @@ import com.yeejoin.amos.feign.workflow.model.ActWorkflowBatchDTO;
 import com.yeejoin.amos.feign.workflow.model.ActWorkflowStartDTO;
 import com.yeejoin.amos.feign.workflow.model.ProcessTaskDTO;
 import com.yeejoin.amos.feign.workflow.model.TaskResultDTO;
-import io.seata.spring.annotation.GlobalTransactional;
 import org.apache.commons.lang3.BooleanUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;

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

@@ -21,7 +21,6 @@ import com.yeejoin.amos.boot.module.hygf.biz.feign.WorkflowFeignClient;
 import com.yeejoin.amos.component.feign.model.FeignClientResult;
 import com.yeejoin.amos.component.robot.AmosRequestContext;
 import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
-import io.seata.spring.annotation.GlobalTransactional;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.lang3.BooleanUtils;

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

@@ -34,7 +34,6 @@ import com.yeejoin.amos.feign.workflow.model.ActWorkflowBatchDTO;
 import com.yeejoin.amos.feign.workflow.model.ActWorkflowStartDTO;
 import com.yeejoin.amos.feign.workflow.model.ProcessTaskDTO;
 import com.yeejoin.amos.feign.workflow.model.TaskResultDTO;
-import io.seata.spring.annotation.GlobalTransactional;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -916,7 +915,7 @@ public class PreparationMoneyServiceImpl extends BaseService<PreparationMoneyDto
     }
 
 
-    @GlobalTransactional
+    @Transactional
     public void uploadVoucher(PreparationMoney model, String instanceId, String isSubmit) {
         //经销商暂存则只更新发货单属性 不进行业务推动
         if ("1".equals(isSubmit)) {
@@ -1033,7 +1032,7 @@ public class PreparationMoneyServiceImpl extends BaseService<PreparationMoneyDto
     }
 
 
-    @GlobalTransactional
+    @Transactional
     public void replenishmentRollback(Long sequenceNbr) {
         LambdaQueryWrapper<HygfPreparationMoneyAuditing> lambda = new LambdaQueryWrapper();
         lambda.eq(HygfPreparationMoneyAuditing::getPreparationMoneyId, sequenceNbr);

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

@@ -25,7 +25,6 @@ import com.yeejoin.amos.component.robot.AmosRequestContext;
 import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
 import com.yeejoin.amos.feign.systemctl.Systemctl;
 import com.yeejoin.amos.feign.systemctl.model.RegionModel;
-import io.seata.spring.annotation.GlobalTransactional;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.BooleanUtils;
 import org.apache.commons.lang3.ObjectUtils;
@@ -149,7 +148,7 @@ public class SurveyInformationServiceImpl
 		return this.queryForList("", false);
 	}
 
-	@GlobalTransactional
+	@Transactional
 	public SurveyInfoAllDto saveSurveyInfo(SurveyInfoAllDto surveyInfoAllDto, String operationType) {
 		String lockName = null;
 		try {

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

@@ -7,7 +7,6 @@ import com.yeejoin.amos.boot.module.hygf.biz.feign.WorkflowFeignClient;
 import com.yeejoin.amos.component.feign.model.FeignClientResult;
 import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
 import com.yeejoin.amos.feign.workflow.model.ProcessTaskDTO;
-import io.seata.spring.annotation.GlobalTransactional;
 import org.apache.commons.lang3.ObjectUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

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

@@ -119,7 +119,7 @@ spring.security.user.password=a1234560
 
 fire-rescue=123
 
-mybatis-plus.global-config.db-config.update-strategy=ignored
+mybatis-plus.global-config.db-config.field-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
@@ -246,9 +246,3 @@ spring.elasticsearch.rest.connection-timeout=30000
 spring.elasticsearch.rest.username=elastic
 spring.elasticsearch.rest.password=123456
 spring.elasticsearch.rest.read-timeout=30000
-## 47环境 排除es报错引进无用配置 业务未实际使用es
-spring.elasticsearch.rest.uris=http://47.92.234.253:9200
-spring.elasticsearch.rest.connection-timeout=30000
-spring.elasticsearch.rest.username=elastic
-spring.elasticsearch.rest.password=123456
-spring.elasticsearch.rest.read-timeout=30000
\ No newline at end of file

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

 ## DB properties:
 spring.datasource.dynamic.primary= mysql-service
-spring.datasource.mysql-service.driver-class-name=com.kingbase8.Driver
-spring.datasource.mysql-service.jdbc-url=jdbc:kingbase8://10.20.1.176:54321/amos_project?allowMultiQueries=true&serverTimezone=GMT%2B8&characterEncoding=utf8&currentSchema=root
+
+#spring.datasource.mysql-service.driver-class-name=com.mysql.cj.jdbc.Driver
+#spring.datasource.mysql-service.jdbc-url=jdbc:mysql://47.92.234.253: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
@@ -50,11 +52,11 @@ spring.datasource.tdengine-service.connection-test-query: SELECT 1
 
 
 ## eureka properties:
-eureka.instance.hostname=10.20.1.160
+eureka.instance.hostname=47.92.234.253
 eureka.client.serviceUrl.defaultZone=http://admin:a1234560@${eureka.instance.hostname}:10001/eureka/
 ## redis properties:
 spring.redis.database=1
-spring.redis.host=10.20.1.210
+spring.redis.host=47.92.234.253
 spring.redis.port=6379
 spring.redis.password=yeejoin@2020
 
@@ -90,7 +92,7 @@ lettuce.timeout=10000
 
 emqx.clean-session=true
 emqx.client-id=${spring.application.name}-${random.int[1024,65536]}
-emqx.broker=tcp://10.20.1.210:2883
+emqx.broker=tcp://47.92.234.253:2883
 emqx.user-name=admin
 emqx.password=public
 emqx.max-inflight=1000
@@ -125,7 +127,7 @@ 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://10.20.1.210:61616
+spring.activemq.broker-url=tcp://47.92.234.253:61616
 spring.activemq.user=admin
 spring.activemq.password=admin
 spring.jms.pub-sub-domain=false
@@ -231,12 +233,18 @@ dealer.amosDealerId=1767820997374775298
 
 #Seata Config
 seata.tx-service-group=hygf-seata
-seata.service.grouplist.hygf-seata=47.92.234.253:8091
+seata.service.grouplist.hygf-seata=172.16.0.29:8091
 # Seata 配置
 seata.enabled=true
 seata.enable-auto-data-source-proxy=false
 #seata.client.undo.log-serialization=kryo
+#
+
+
 
-seata.datasource.autoproxy.datasource-proxy-mode=original
-seata.datasource.autoproxy.enabled=true
-seata.datasource.autoproxy.data-source-names=postgresql
+## 47环境 排除es报错引进无用配置 业务未实际使用es
+spring.elasticsearch.rest.uris=http://47.92.234.253:9200
+spring.elasticsearch.rest.connection-timeout=30000
\ No newline at end of file
+spring.elasticsearch.rest.username=elastic
+spring.elasticsearch.rest.password=123456
+spring.elasticsearch.rest.read-timeout=30000

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

@@ -2,7 +2,7 @@ spring.application.name=AMOS-HYGF-CZ
 server.servlet.context-path=/hygf
 server.port=33330
 server.uri-encoding=UTF-8
-spring.profiles.active=dev
+spring.profiles.active=kingbase8
 spring.jackson.time-zone=GMT+8
 spring.jackson.date-format=yyyy-MM-dd HH:mm:ss
 logging.config=classpath:logback-${spring.profiles.active}.xml
@@ -56,7 +56,7 @@ amos.system.user.user-name=hygf_robot
 amos.system.user.password=a1234560
 amos.system.user.product=AMOS_STUDIO_WEB
 amos.system.user.app-key=AMOS_STUDIO
-workflow.feign.name=AMOS-API-WORKFLOW-CZ
+workflow.feign.name=AMOS-API-WORKFLOW
 
 
 feign.okhttp.enabled= true
\ No newline at end of file

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/resources/logback-dev.xml

@@ -28,16 +28,16 @@
     </encoder>
 </appender>
 <!--myibatis log configure-->
-<logger name="com.apache.ibatis" level="INFO"/>
-<logger name="java.sql.Connection" level="INFO"/>
-<logger name="java.sql.Statement" level="INFO"/>
-<logger name="java.sql.PreparedStatement" level="INFO"/>
-<logger name="com.baomidou.mybatisplus" level="INFO"/>
-<logger name="org.springframework" level="INFO"/>
-<logger name="org.typroject" level="INFO"/>
-<logger name="com.yeejoin" level="INFO"/>
+<logger name="com.apache.ibatis" level="DEBUG"/>
+<logger name="java.sql.Connection" level="DEBUG"/>
+<logger name="java.sql.Statement" level="DEBUG"/>
+<logger name="java.sql.PreparedStatement" level="DEBUG"/>
+<logger name="com.baomidou.mybatisplus" level="DEBUG"/>
+<logger name="org.springframework" level="DEBUG"/>
+<logger name="org.typroject" level="DEBUG"/>
+<logger name="com.yeejoin" level="DEBUG"/>
 <!-- 日志输出级别 -->
-<root level="INFO">
+<root level="DEBUG">
     <appender-ref ref="FILE" />
     <appender-ref ref="STDOUT" />
 </root>

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/resources/logback-kingbase8.xml

@@ -37,7 +37,7 @@
 <logger name="org.typroject" level="DEBUG"/>
 <logger name="com.yeejoin" level="DEBUG"/>
 <!-- 日志输出级别 -->
-<root level="INFO">
+<root level="DEBUG">
     <appender-ref ref="FILE" />
     <appender-ref ref="STDOUT" />
 </root>

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

+package com.yeejoin.amos.boot.module.jxiop.biz.config;
+
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+
+import org.apache.ibatis.type.BaseTypeHandler;
+import org.apache.ibatis.type.JdbcType;
+import org.apache.ibatis.type.MappedJdbcTypes;
+
+@MappedJdbcTypes(JdbcType.BIT)
+public class BitTypeHandler extends BaseTypeHandler<Boolean> {
+	@Override
+	public void setNonNullParameter(PreparedStatement ps, int i, Boolean parameter, JdbcType jdbcType)
+			throws SQLException {
+		//原生的boolean会再sql上加上引号比如'0'或者'1',人大金仓不支持,支持不带引号的
+		//ps.setBoolean(i, parameter);
+		ps.setInt(i, parameter?1:0);
+	}
+
+	@Override
+	public Boolean getNullableResult(ResultSet rs, String columnName) throws SQLException {
+		return rs.getBoolean(columnName);
+	}
+
+	@Override
+	public Boolean getNullableResult(ResultSet rs, int columnIndex) throws SQLException {
+		return rs.getBoolean(columnIndex);
+	}
+
+	@Override
+	public Boolean getNullableResult(java.sql.CallableStatement cs, int columnIndex) throws SQLException {
+		return cs.getBoolean(columnIndex);
+	}
+}

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

@@ -4,33 +4,33 @@ spring.db1.datasource.type: com.alibaba.druid.pool.DruidDataSource
 spring.db1.datasource.url=jdbc:kingbase8://10.20.1.176:54321/production?allowMultiQueries=true&serverTimezone=GMT%2B8&characterEncoding=utf8&currentSchema=root
 spring.db1.datasource.username=root
 spring.db1.datasource.password=Yeejoin@2020
-spring.db1.datasource.driver-class-name: com.kingbase8.Driver
+spring.db1.datasource.driver-class-name=com.kingbase8.Driver
 ## db2-sync_data
 spring.db2.datasource.type: com.alibaba.druid.pool.DruidDataSource
 spring.db2.datasource.url=jdbc:kingbase8://10.20.1.176:54321/jxiop_sync_data?allowMultiQueries=true&serverTimezone=GMT%2B8&characterEncoding=utf8&currentSchema=root
 spring.db2.datasource.username=root
 spring.db2.datasource.password=Yeejoin@2020
-spring.db2.datasource.driver-class-name: com.kingbase8.Driver
-##db3
-spring.db3.datasource.url=jdbc:TAOS-RS://10.20.1.157:6041/iot_data?user=root&password=taosdata&timezone=GMT%2b8&allowMultiQueries=true
+spring.db2.datasource.driver-class-name=com.kingbase8.Driver
+
+
+spring.db3.datasource.url=jdbc:TAOS-RS://10.20.0.203:6041/iot_data?user=root&password=taosdata&timezone=GMT%2b8&allowMultiQueries=true
 spring.db3.datasource.username=root
 spring.db3.datasource.password=taosdata
 spring.db3.datasource.driver-class-name: com.taosdata.jdbc.rs.RestfulDriver
-##db4
-spring.db4.datasource.url=jdbc:TAOS-RS://10.20.1.157:6041/iot_data?user=root&password=taosdata&timezone=GMT%2b8&allowMultiQueries=true
+
+spring.db4.datasource.url=jdbc:TAOS-RS://10.20.0.203:6041/analysis_data?user=root&password=taosdata&timezone=GMT%2b8&allowMultiQueries=true
 spring.db4.datasource.username=root
 spring.db4.datasource.password=taosdata
 spring.db4.datasource.driver-class-name: com.taosdata.jdbc.rs.RestfulDriver
 
-# kingbase8 backquote not support
-mybatis-plus.global-config.db-config.table-field-strategy=ignore
 
 ## eureka properties:
-eureka.instance.hostname=10.20.1.160
-eureka.client.serviceUrl.defaultZone=http://admin:a1234560@${eureka.instance.hostname}:10001/eureka/
+#eureka.instance.hostname=139.9.173.44
+eureka.instance.prefer-ip-address = true
+eureka.client.serviceUrl.defaultZone=http://admin:a1234560@47.92.234.253:10001/eureka/
 ## redis properties:
 spring.redis.database=1
-spring.redis.host=10.20.1.210
+spring.redis.host=47.92.234.253
 spring.redis.port=6379
 spring.redis.password=yeejoin@2020
 
@@ -65,17 +65,18 @@ lettuce.timeout=10000
 
 
 emqx.clean-session=true
-emqx.client-id=${spring.application.name}-${random.int[1024,65536]}
-emqx.broker=tcp://10.20.1.210:2883
+emqx.client-id=AMOS-JXIOP-BIGSCREEN
+emqx.client-user-name=
+emqx.client-password=
+emqx.broker=tcp://47.92.234.253:2883
 emqx.user-name=admin
 emqx.password=public
-mqtt.scene.host=mqtt://10.20.1.210:8083/mqtt
+mqtt.scene.host=mqtt://47.92.234.253:8083/mqtt
 mqtt.client.product.id=mqtt
 mqtt.topic=topic_mqtt
 spring.mqtt.completionTimeout=3000
 emqx.max-inflight=1000
-emqx.client-user-name=admin
-emqx.client-password=public
+
 
 ## influxDB
 #spring.influx.url= http://172.16.3.155:18186
@@ -98,7 +99,8 @@ emqx.client-password=public
 #spring.influx.bufferLimit=20000
 
 
-#spring.influx.url=http://10.20.1.157:18086
+# influxDB
+#spring.influx.url= http://192.168.120.102:18086
 #spring.influx.password=Yeejoin@2020
 #spring.influx.user=root
 #spring.influx.database=iot_platform
@@ -128,28 +130,19 @@ amos.secret.key=qaz
 #eureka.instance.ip-address=172.16.3.122
 
 
-spring.activemq.broker-url=tcp://10.20.1.210:61616
+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
-spring.elasticsearch.rest.uris=http://10.20.0.223:9200
-
-spring.elasticsearch.rest.connection-timeout=30000
-
-spring.elasticsearch.rest.username=elastic
-
-spring.elasticsearch.rest.password=Yeejoin@2020
-
-spring.elasticsearch.rest.read-timeout=30000
 
 # ?????????
 fan.statuts.stattuspath=upload/jxiop/device_status
 
 pictureUrl=upload/jxiop/syz/
 
-# Ԥ
-idx.predict.serviceUrl=http://10.20.1.157:8095/jxdj/predict-data
+large.cron=0 0/5 * * * ?
 
 forecast.url=
-logic=
+
\ No newline at end of file
+logic=

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

@@ -2,7 +2,7 @@ spring.application.name=AMOS-JXIOP-BIGSCREEN-CZ
 server.servlet.context-path=/jxiop-bigscreen
 server.port=33300
 server.uri-encoding=UTF-8
-spring.profiles.active=dev1
+spring.profiles.active=kingbase8
 spring.jackson.time-zone=GMT+8
 spring.jackson.date-format=yyyy-MM-dd HH:mm:ss
 logging.config=classpath:logback-${spring.profiles.active}.xml
@@ -75,11 +75,7 @@ station.section=10
 gl.sum.column=日发电量,月发电量,年发电量
 gl.avg.column=有功功率,日利用小时,瞬时风速
 
-spring.elasticsearch.rest.uris=http://139.9.173.44:9200
-spring.elasticsearch.rest.connection-timeout=30000
-spring.elasticsearch.rest.username=elastic
-spring.elasticsearch.rest.password=Yeejoin@2020
-spring.elasticsearch.rest.read-timeout=30000
+
 
 daily.power.generation.cron=0 0/1 * * * ?
 moon.power.generation.cron=0 0/1 * * * ?

pom.xml

@@ -329,10 +329,10 @@
         <module>amos-boot-biz-common</module>
         <module>amos-boot-core</module>
         <module>amos-boot-data</module>
-        <module>amos-boot-module</module>
-        <module>amos-boot-system-ccs</module>
-        <module>amos-boot-system-jcs</module>
-        <module>amos-boot-system-equip</module>
+<!--        <module>amos-boot-module</module>-->
+<!--        <module>amos-boot-system-ccs</module>-->
+<!--        <module>amos-boot-system-jcs</module>-->
+<!--        <module>amos-boot-system-equip</module>-->
         <module>amos-boot-system-jxiop</module>
     </modules>
 </project>
\ No newline at end of file