diff --git a/itc-pcitc-demo/itc-pcitc-demo-api/pom.xml b/itc-pcitc-demo/itc-pcitc-demo-api/pom.xml index 8f8713f..da8c8e1 100644 --- a/itc-pcitc-demo/itc-pcitc-demo-api/pom.xml +++ b/itc-pcitc-demo/itc-pcitc-demo-api/pom.xml @@ -17,6 +17,10 @@ ${java.version} ${java.version} + http://10.10.2.102:9500 + admin + Gas@Dev123 + false @@ -38,14 +42,26 @@ - org.apache.maven.plugins - maven-compiler-plugin + com.geg + tanuki-compiler-maven-plugin + 1.0.0 ${java.version} ${java.version} + ${libServerUrl} + ${libServerUser} + ${libServerPwd} + + + + jarupload + + + + src/main/java diff --git a/itc-pcitc-demo/itc-pcitc-demo-service/src/main/java/com/xjrsoft/common/ListenerDemo.java b/itc-pcitc-demo/itc-pcitc-demo-service/src/main/java/com/xjrsoft/common/ListenerDemo.java new file mode 100644 index 0000000..d573075 --- /dev/null +++ b/itc-pcitc-demo/itc-pcitc-demo-service/src/main/java/com/xjrsoft/common/ListenerDemo.java @@ -0,0 +1,21 @@ +package com.xjrsoft.common; + +import java.util.Map; + +import org.springframework.stereotype.Component; + +import com.pictc.listener.ListenerParameterContext; +import com.pictc.listener.ListenerR; +import com.pictc.listener.PEventListener; + +@Component +public class ListenerDemo { + + @PEventListener("#source == 'lng_upload_file'") + public ListenerR add(ListenerParameterContext context){ + Map data = (Map) context.getData(); + + return ListenerR.success(1L); + } + +} diff --git a/itc-pcitc-dependencies/itc-pcitc-dependencies-service/src/main/java/com/pictc/listener/ListenerR.java b/itc-pcitc-dependencies/itc-pcitc-dependencies-service/src/main/java/com/pictc/listener/ListenerR.java new file mode 100644 index 0000000..1d5be21 --- /dev/null +++ b/itc-pcitc-dependencies/itc-pcitc-dependencies-service/src/main/java/com/pictc/listener/ListenerR.java @@ -0,0 +1,29 @@ +package com.pictc.listener; + +import java.io.Serializable; + +import lombok.Data; +import lombok.experimental.Accessors; + +@Data +@Accessors(chain = true) +public class ListenerR implements Serializable{ + + /** + * @Fields {todo}(用一句话描述这个变量表示什么) + */ + private static final long serialVersionUID = 1L; + + private boolean success; + + private T data; + + public static ListenerR success(T data){ + return new ListenerR().setData(data).setSuccess(true); + } + + public static ListenerR error(){ + return new ListenerR(); + } + +} diff --git a/itc-pcitc-dependencies/itc-pcitc-dependencies-service/src/main/java/com/pictc/listener/PEventListenerPublisher.java b/itc-pcitc-dependencies/itc-pcitc-dependencies-service/src/main/java/com/pictc/listener/PEventListenerPublisher.java index 76a3c3f..71d9cce 100644 --- a/itc-pcitc-dependencies/itc-pcitc-dependencies-service/src/main/java/com/pictc/listener/PEventListenerPublisher.java +++ b/itc-pcitc-dependencies/itc-pcitc-dependencies-service/src/main/java/com/pictc/listener/PEventListenerPublisher.java @@ -11,6 +11,8 @@ import org.springframework.http.RequestEntity; import org.springframework.http.ResponseEntity; import org.springframework.web.client.RestTemplate; +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONObject; import com.pictc.utils.CollectionUtils; import com.pictc.utils.ObjectUtils; @@ -26,17 +28,17 @@ public class PEventListenerPublisher { PEventListenerPublisher.rest = rest; } - public static boolean publish(Object source,Object data) { - return publish(source, data, false); + public static ListenerR publish(Object source,Object data,Class responseType) { + return publish(source, data,responseType,false); } - public static boolean publish(Object source,Object data,boolean single) { + public static ListenerR publish(Object source,Object data,Class responseType,boolean single) { ListenerParameterContext conetext = new ListenerParameterContext(); - conetext.setSource(TNacosManager.getAppName()+":"+source.getClass().getCanonicalName()); + conetext.setSource(TNacosManager.getAppName()+":"+source); conetext.setData(data); conetext.setSingle(single); Set services = TNacosManager.getNotSelfServices(); - boolean flag = single?false:true; + ListenerR res = new ListenerR(); if(CollectionUtils.isNotEmpty(services)) { HttpHeaders headers = TNacosManager.createNewHeaders(); byte[] bytes = ObjectUtils.toBytes(conetext); @@ -45,10 +47,22 @@ public class PEventListenerPublisher { URI uri = TNacosManager.getServiceURI(serviceId); if(uri!=null) { RequestEntity request = new RequestEntity(bytes,headers,HttpMethod.POST,uri); - ResponseEntity responseEntity = rest.exchange(request,boolean.class); - if(single && responseEntity.hasBody() && responseEntity.getBody()) { - return true; + ResponseEntity responseEntity = rest.exchange(request,String.class); + if(responseEntity.hasBody()) { + String json = responseEntity.getBody(); + JSONObject jsonData = JSON.parseObject(json); + res.setSuccess(jsonData.getBooleanValue("success")); + if(jsonData.containsKey("data")) { + Object rdata = jsonData.get("data"); + if(rdata instanceof JSONObject) { + res.setData(((JSONObject)rdata).toJavaObject(responseType)); + }else { + res.setData(jsonData.getObject("data", responseType)); + } + } + } + if(single) return res; } } catch (URISyntaxException e) { e.printStackTrace(); @@ -56,7 +70,7 @@ public class PEventListenerPublisher { } } } - return flag; + return res; } } diff --git a/itc-pcitc-dependencies/itc-pcitc-dependencies-service/src/main/java/com/pictc/utils/FlowDataUtils.java b/itc-pcitc-dependencies/itc-pcitc-dependencies-service/src/main/java/com/pictc/utils/FlowDataUtils.java new file mode 100644 index 0000000..66d6e88 --- /dev/null +++ b/itc-pcitc-dependencies/itc-pcitc-dependencies-service/src/main/java/com/pictc/utils/FlowDataUtils.java @@ -0,0 +1,14 @@ +package com.pictc.utils; + +import java.util.Map; + +public class FlowDataUtils { + + + public static T parseData(String tblName,Map formData){ + + return null; + } + + +} diff --git a/itc-pcitc-dependencies/itc-pcitc-dependencies-service/src/main/java/com/pictc/utils/MybatisTools.java b/itc-pcitc-dependencies/itc-pcitc-dependencies-service/src/main/java/com/pictc/utils/MybatisTools.java index cfca8c2..982ec4d 100644 --- a/itc-pcitc-dependencies/itc-pcitc-dependencies-service/src/main/java/com/pictc/utils/MybatisTools.java +++ b/itc-pcitc-dependencies/itc-pcitc-dependencies-service/src/main/java/com/pictc/utils/MybatisTools.java @@ -33,10 +33,8 @@ public class MybatisTools implements ApplicationContextAware { for (BaseMapper mapper : mapperBeans.values()) { // 获取Mapper接口的Class对象（因为mapper是代理对象，需要获取原始接口） Class mapperInterface = getMapperInterface(mapper.getClass()); - // 解析Mapper接口对应的实体类 Class entityClass = resolveEntityClass(mapperInterface); - if (entityClass != null) { ENTITY_MAPPER_MAP.put(entityClass, mapper); } diff --git a/itc-pcitc-dependencies/itc-pcitc-dependencies-service/src/main/java/com/xjrsoft/module/datalog/service/impl/DatalogServiceImpl.java b/itc-pcitc-dependencies/itc-pcitc-dependencies-service/src/main/java/com/xjrsoft/module/datalog/service/impl/DatalogServiceImpl.java index 9fcfdec..ffe408b 100644 --- a/itc-pcitc-dependencies/itc-pcitc-dependencies-service/src/main/java/com/xjrsoft/module/datalog/service/impl/DatalogServiceImpl.java +++ b/itc-pcitc-dependencies/itc-pcitc-dependencies-service/src/main/java/com/xjrsoft/module/datalog/service/impl/DatalogServiceImpl.java @@ -18,21 +18,18 @@ import com.xjrsoft.module.datalog.vo.DataChangeLogVo; public class DatalogServiceImpl implements DatalogService{ @Transactional(rollbackFor = Exception.class) - @GlobalTransactional(rollbackFor = Exception.class) // Seata全局事务注解 @Override public T insert(T entity) { return DataLogTools.insert(entity); } @Transactional(rollbackFor = Exception.class) - @GlobalTransactional(rollbackFor = Exception.class) // Seata全局事务注解 @Override public T insert(T entity, DataOperationListener listener) { return DataLogTools.insert(entity,listener); } @Transactional(rollbackFor = Exception.class) - @GlobalTransactional(rollbackFor = Exception.class) // Seata全局事务注解 @Override public List insertBatch(List entitys) { List res = Lists.newArrayList(); @@ -43,7 +40,6 @@ public class DatalogServiceImpl implements DatalogService{ } @Transactional(rollbackFor = Exception.class) - @GlobalTransactional(rollbackFor = Exception.class) // Seata全局事务注解 @Override public List insertBatch(List entitys, DataOperationListener listener) { List res = Lists.newArrayList(); @@ -54,7 +50,6 @@ public class DatalogServiceImpl implements DatalogService{ } @Transactional(rollbackFor = Exception.class) - @GlobalTransactional(rollbackFor = Exception.class) // Seata全局事务注解 @Override public boolean updateById(T entity) { DataLogTools.update(entity); @@ -62,7 +57,6 @@ public class DatalogServiceImpl implements DatalogService{ } @Transactional(rollbackFor = Exception.class) - @GlobalTransactional(rollbackFor = Exception.class) // Seata全局事务注解 @Override public boolean updateById(T entity, DataOperationListener listener) { DataLogTools.update(entity,listener); @@ -70,7 +64,6 @@ public class DatalogServiceImpl implements DatalogService{ } @Transactional(rollbackFor = Exception.class) - @GlobalTransactional(rollbackFor = Exception.class) // Seata全局事务注解 @Override public T delete(T entity) { return DataLogTools.delete(entity); @@ -78,7 +71,6 @@ public class DatalogServiceImpl implements DatalogService{ @Transactional(rollbackFor = Exception.class) - @GlobalTransactional(rollbackFor = Exception.class) // Seata全局事务注解 @Override public T deleteById(Class klazz, long id) { return DataLogTools.deleteById(klazz, id); @@ -86,28 +78,24 @@ public class DatalogServiceImpl implements DatalogService{ @Transactional(rollbackFor = Exception.class) - @GlobalTransactional(rollbackFor = Exception.class) // Seata全局事务注解 @Override public T deleteById(Class klazz, long id, DataOperationListener listener) { return DataLogTools.deleteById(klazz,id,listener); } @Transactional(rollbackFor = Exception.class) - @GlobalTransactional(rollbackFor = Exception.class) // Seata全局事务注解 @Override public boolean deleteByIds(Class klazz, @Valid List ids) { return DataLogTools.deleteByIds(klazz, ids); } @Transactional(rollbackFor = Exception.class) - @GlobalTransactional(rollbackFor = Exception.class) // Seata全局事务注解 @Override public boolean deleteByIds(Class klazz, @Valid List ids, DataOperationListener listener) { return DataLogTools.deleteByIds(klazz,ids,listener); } @Transactional(readOnly = true) - @GlobalTransactional(rollbackFor = Exception.class) // Seata全局事务注解 @Override public List findLogsByEntityId(Class klazz, long dataId) { return DataLogTools.findLogsByEntityId(klazz, dataId); @@ -115,28 +103,24 @@ public class DatalogServiceImpl implements DatalogService{ @Transactional(rollbackFor = Exception.class) - @GlobalTransactional(rollbackFor = Exception.class) // Seata全局事务注解 @Override public boolean enable(Class klazz, @Valid List ids) { return DataLogTools.enable(klazz, ids); } @Transactional(rollbackFor = Exception.class) - @GlobalTransactional(rollbackFor = Exception.class) // Seata全局事务注解 @Override public boolean enable(Class klazz, @Valid List ids, DataOperationListener listener) { return DataLogTools.enable(klazz,ids,listener); } @Transactional(rollbackFor = Exception.class) - @GlobalTransactional(rollbackFor = Exception.class) // Seata全局事务注解 @Override public boolean disable(Class klazz, @Valid List ids) { return DataLogTools.disable(klazz, ids); } @Transactional(rollbackFor = Exception.class) - @GlobalTransactional(rollbackFor = Exception.class) // Seata全局事务注解 @Override public boolean disable(Class klazz, @Valid List ids, DataOperationListener listener) { return DataLogTools.disable(klazz,ids,listener); diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/dto/UpdateLngBBankDto.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/dto/UpdateLngBBankDto.java index 5fec267..9304d18 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/dto/UpdateLngBBankDto.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/dto/UpdateLngBBankDto.java @@ -33,7 +33,7 @@ public class UpdateLngBBankDto implements Serializable { /** * 助记码(自动生成，4位，0001……) */ - @LogField(name="助记码(自动生成，4位，0001……)",index=1) + @LogField(name="助记码",index=1) @ApiModelProperty("助记码(自动生成，4位，0001……)") private String code; diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/ListenerDemo.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/ListenerDemo.java new file mode 100644 index 0000000..4dd07ce --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/ListenerDemo.java @@ -0,0 +1,34 @@ +package com.xjrsoft.module; + +import java.util.Map; + +import org.springframework.stereotype.Component; + +import com.pictc.listener.ListenerParameterContext; +import com.pictc.listener.ListenerR; +import com.pictc.listener.PEventListener; + +import lombok.extern.slf4j.Slf4j; + +@Slf4j +@Component +public class ListenerDemo { + + @PEventListener("#source == 'lng_upload_file'") + public ListenerR add(ListenerParameterContext context){ + log.info("表名：{}",context.getSource()); + Map data = (Map) context.getData(); + log.info("数据：{}",data); + return ListenerR.success(1L); + } + + + @PEventListener + public ListenerR add2(ListenerParameterContext context){ + Map data = (Map) context.getData(); + log.info("表名：{}",context.getSource()); + log.info("数据：{}",data); + return ListenerR.success(1L); + } + +}