提交 6a0e875c 编写于 作者: ibizdev's avatar ibizdev

generator before deploy...

generator before deploy registry.cn-shanghai.aliyuncs.com/ibizsys/samplesolution-demosys-api-demoapi:2022.11.14.001
上级 9d055eb4
...@@ -12,4 +12,4 @@ ...@@ -12,4 +12,4 @@
**.iml **.iml
*.jar *.jar
*.log *.log
.DS_Store .DS_Store
\ No newline at end of file
...@@ -51,4 +51,4 @@ public class BootApplication extends WebMvcConfigurerAdapter { ...@@ -51,4 +51,4 @@ public class BootApplication extends WebMvcConfigurerAdapter {
super.addArgumentResolvers(argumentResolvers); super.addArgumentResolvers(argumentResolvers);
argumentResolvers.add(resolver); argumentResolvers.add(resolver);
} }
} }
\ No newline at end of file
...@@ -5,6 +5,8 @@ spring: ...@@ -5,6 +5,8 @@ spring:
name: demosys name: demosys
main: main:
allow-bean-definition-overriding: true allow-bean-definition-overriding: true
messages:
basename: i18n/messages
server: server:
servlet: servlet:
contextPath: /demosys contextPath: /demosys
\ No newline at end of file
...@@ -10,8 +10,8 @@ ...@@ -10,8 +10,8 @@
</parent> </parent>
<artifactId>demo-core</artifactId> <artifactId>demo-core</artifactId>
<name>后台服务 Core</name> <name>Demo Core</name>
<description>后台服务 Core</description> <description>后台服务 Core,模板生成代码,再次发布会覆盖,建议不要直接修改,修改请在demo-boot项目中继承或覆盖重写</description>
<dependencies> <dependencies>
...@@ -20,6 +20,14 @@ ...@@ -20,6 +20,14 @@
<artifactId>ibizlab-boot-starter-data</artifactId> <artifactId>ibizlab-boot-starter-data</artifactId>
<version>2.4.0-SNAPSHOT</version> <version>2.4.0-SNAPSHOT</version>
</dependency> </dependency>
<!-- MySQL驱动包 -->
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
</dependency>
</dependencies> </dependencies>
<properties> <properties>
...@@ -93,4 +101,4 @@ ...@@ -93,4 +101,4 @@
</profile> </profile>
</profiles> </profiles>
</project> </project>
\ No newline at end of file
...@@ -95,6 +95,17 @@ public class IBIZOrderSearchContext extends QueryWrapperContext<IBIZOrder> { ...@@ -95,6 +95,17 @@ public class IBIZOrderSearchContext extends QueryWrapperContext<IBIZOrder> {
return this; return this;
} }
@JsonProperty("n_ibizordername_userlike")
@JSONField(name = "n_ibizordername_userlike")
@ApiModelProperty("订单名称USERLIKE")
private String ibizOrderNameUSERLIKE;
public IBIZOrderSearchContext setIbizOrderNameUSERLIKE(String ibizOrderNameUSERLIKE) {
this.ibizOrderNameUSERLIKE = ibizOrderNameUSERLIKE;
if(!ObjectUtils.isEmpty(this.ibizOrderNameUSERLIKE)){
}
return this;
}
@JsonProperty("n_ordertime_gt") @JsonProperty("n_ordertime_gt")
@JsonFormat(pattern = "yyyy-MM-dd", locale = "zh", timezone = "GMT+8") @JsonFormat(pattern = "yyyy-MM-dd", locale = "zh", timezone = "GMT+8")
@JSONField(name = "n_ordertime_gt" , format = "yyyy-MM-dd") @JSONField(name = "n_ordertime_gt" , format = "yyyy-MM-dd")
......
...@@ -80,6 +80,14 @@ public interface IBIZCustomerService extends IService<IBIZCustomer> { ...@@ -80,6 +80,14 @@ public interface IBIZCustomerService extends IService<IBIZCustomer> {
boolean removeByEntities(List<IBIZCustomer> entities); boolean removeByEntities(List<IBIZCustomer> entities);
default IBIZCustomer getDynaCarousel(String key) {
return null;
}
default IBIZCustomer getDynaImg(String key) {
return null;
}
Page<IBIZCustomer> searchDefault(IBIZCustomerSearchContext context); Page<IBIZCustomer> searchDefault(IBIZCustomerSearchContext context);
List<IBIZCustomer> listDefault(IBIZCustomerSearchContext context); List<IBIZCustomer> listDefault(IBIZCustomerSearchContext context);
......
...@@ -155,6 +155,16 @@ public class IBIZCustomerServiceBase extends ServiceImpl<IBIZCustomerMapper,IBIZ ...@@ -155,6 +155,16 @@ public class IBIZCustomerServiceBase extends ServiceImpl<IBIZCustomerMapper,IBIZ
return true; return true;
} }
@Transactional
public IBIZCustomer getDynaCarousel(String key) {
return null;
}
@Transactional
public IBIZCustomer getDynaImg(String key) {
return null;
}
public Page<IBIZCustomer> searchDefault(IBIZCustomerSearchContext context) { public Page<IBIZCustomer> searchDefault(IBIZCustomerSearchContext context) {
com.baomidou.mybatisplus.extension.plugins.pagination.Page<IBIZCustomer> pages=baseMapper.searchDefault(context.getPages(),context,context.getSelectCond()); com.baomidou.mybatisplus.extension.plugins.pagination.Page<IBIZCustomer> pages=baseMapper.searchDefault(context.getPages(),context,context.getSelectCond());
return new PageImpl<IBIZCustomer>(pages.getRecords(), context.getPageable(), pages.getTotal()); return new PageImpl<IBIZCustomer>(pages.getRecords(), context.getPageable(), pages.getTotal());
......
...@@ -108,6 +108,24 @@ public class IBIZCustomerResource { ...@@ -108,6 +108,24 @@ public class IBIZCustomerResource {
return ResponseEntity.status(HttpStatus.OK).body(ibizCustomerDtoMapping.toDto(rt)); return ResponseEntity.status(HttpStatus.OK).body(ibizCustomerDtoMapping.toDto(rt));
} }
@ApiOperation(value = "GetDynaCarousel", tags = {"客户" }, notes = "IBIZCustomer-GetDynaCarousel")
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','DemoSys-IBIZCustomer-GetDynaCarousel-all') or hasPermission(this.ibizCustomerService.get(#ibizCustomerId),'DemoSys-IBIZCustomer-GetDynaCarousel')")
@RequestMapping(method = RequestMethod.GET, value = "ibizcustomers/{ibizCustomerId}/getdynacarousel")
public ResponseEntity<IBIZCustomerDTO> getDynaCarouselByIbizCustomerId
(@PathVariable("ibizCustomerId") String ibizCustomerId) {
IBIZCustomer rt = ibizCustomerService.getDynaCarousel(ibizCustomerId);
return ResponseEntity.status(HttpStatus.OK).body(ibizCustomerDtoMapping.toDto(rt));
}
@ApiOperation(value = "GetDynaImg", tags = {"客户" }, notes = "IBIZCustomer-GetDynaImg")
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','DemoSys-IBIZCustomer-GetDynaImg-all') or hasPermission(this.ibizCustomerService.get(#ibizCustomerId),'DemoSys-IBIZCustomer-GetDynaImg')")
@RequestMapping(method = RequestMethod.GET, value = "ibizcustomers/{ibizCustomerId}/getdynaimg")
public ResponseEntity<IBIZCustomerDTO> getDynaImgByIbizCustomerId
(@PathVariable("ibizCustomerId") String ibizCustomerId) {
IBIZCustomer rt = ibizCustomerService.getDynaImg(ibizCustomerId);
return ResponseEntity.status(HttpStatus.OK).body(ibizCustomerDtoMapping.toDto(rt));
}
@ApiOperation(value = "保存Save", tags = {"客户" }, notes = "IBIZCustomer-Save") @ApiOperation(value = "保存Save", tags = {"客户" }, notes = "IBIZCustomer-Save")
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','DemoSys-IBIZCustomer-Save-all') or hasPermission(this.ibizCustomerDtoMapping.toDomain(#dto),'DemoSys-IBIZCustomer-Save')") @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','DemoSys-IBIZCustomer-Save-all') or hasPermission(this.ibizCustomerDtoMapping.toDomain(#dto),'DemoSys-IBIZCustomer-Save')")
@RequestMapping(method = RequestMethod.POST, value = "ibizcustomers/save") @RequestMapping(method = RequestMethod.POST, value = "ibizcustomers/save")
......
...@@ -108,6 +108,11 @@ public class PermissionSyncJob implements ApplicationRunner { ...@@ -108,6 +108,11 @@ public class PermissionSyncJob implements ApplicationRunner {
map.put("ACTv1.bpmn", IOUtils.toString(this.getClass().getResourceAsStream("/workflow/ACTv1.bpmn"), "UTF-8")); map.put("ACTv1.bpmn", IOUtils.toString(this.getClass().getResourceAsStream("/workflow/ACTv1.bpmn"), "UTF-8"));
workflows.add(map); workflows.add(map);
} }
if (!ObjectUtils.isEmpty(this.getClass().getResourceAsStream("/workflow/ACTv2.bpmn"))) {
Map<String, Object> map=new HashMap<String, Object>();
map.put("ACTv2.bpmn", IOUtils.toString(this.getClass().getResourceAsStream("/workflow/ACTv2.bpmn"), "UTF-8"));
workflows.add(map);
}
if (!ObjectUtils.isEmpty(this.getClass().getResourceAsStream("/workflow/SNv1.bpmn"))) { if (!ObjectUtils.isEmpty(this.getClass().getResourceAsStream("/workflow/SNv1.bpmn"))) {
Map<String, Object> map=new HashMap<String, Object>(); Map<String, Object> map=new HashMap<String, Object>();
map.put("SNv1.bpmn", IOUtils.toString(this.getClass().getResourceAsStream("/workflow/SNv1.bpmn"), "UTF-8")); map.put("SNv1.bpmn", IOUtils.toString(this.getClass().getResourceAsStream("/workflow/SNv1.bpmn"), "UTF-8"));
......
package cn.ibizlab.util.message;
import org.springframework.context.MessageSource;
import org.springframework.context.i18n.LocaleContextHolder;
import org.springframework.stereotype.Component;
/**
* 国际化工具类
*/
@Component
public class MessageUtils {
private static MessageSource messageSource;
public MessageUtils(MessageSource messageSource) {
MessageUtils.messageSource = messageSource;
}
/**
* 获取单个国际化翻译值
*/
public static String get(String msgKey) {
try {
return messageSource.getMessage(msgKey, null, LocaleContextHolder.getLocale());
} catch (Exception e) {
return msgKey;
}
}
}
\ No newline at end of file
#DEF.LNAME.FILEAT=\u6587\u4ef6\u9644\u4ef6
\ No newline at end of file
#DEF.LNAME.FILEAT=File Attachment
\ No newline at end of file
#DEF.LNAME.FILEAT=\u6587\u4ef6\u9644\u4ef6
\ No newline at end of file
...@@ -92,6 +92,9 @@ ...@@ -92,6 +92,9 @@
{ {
"id": "menuitem1", "id": "menuitem1",
"name": "工作台" }, "name": "工作台" },
{
"id": "menuitem201",
"name": "测试界面逻辑" },
{ {
"id": "menuitem3", "id": "menuitem3",
"name": "控件", "name": "控件",
...@@ -584,7 +587,10 @@ ...@@ -584,7 +587,10 @@
"item": [ "item": [
{ {
"id": "menuitem98", "id": "menuitem98",
"name": "自定义视图" } "name": "自定义视图" },
{
"id": "menuitem212",
"name": "自定义实现表格视图" }
] ]
} }
...@@ -677,7 +683,23 @@ ...@@ -677,7 +683,23 @@
"name": "表单嵌入卡片视图" }, "name": "表单嵌入卡片视图" },
{ {
"id": "menuitem25", "id": "menuitem25",
"name": "关系界面刷新主表单" } "name": "关系界面刷新主表单" },
{
"id": "menuitem208",
"name": "界面逻辑测试",
"item": [
{
"id": "menuitem209",
"name": "表格加载" },
{
"id": "menuitem210",
"name": "表单界面逻辑加载" },
{
"id": "menuitem131",
"name": "表格部件界面逻辑测试" }
]
}
] ]
}, },
...@@ -696,16 +718,16 @@ ...@@ -696,16 +718,16 @@
"name": "布局面板组件测试" }, "name": "布局面板组件测试" },
{ {
"id": "menuitem205", "id": "menuitem205",
"name": "项布局面板测试" }, "name": "项布局面板布局" },
{
"id": "menuitem131",
"name": "编辑视图(左右关系)" },
{ {
"id": "menuitem142", "id": "menuitem142",
"name": "列表视图(自定义面板)" }, "name": "视图布局面板测试" },
{ {
"id": "menuitem189", "id": "menuitem189",
"name": "测试布局面板(树导航)" }, "name": "项布局面板测试" },
{
"id": "menuitem213",
"name": "按钮测试" },
{ {
"id": "menuitem190", "id": "menuitem190",
"name": "视图", "name": "视图",
...@@ -841,10 +863,7 @@ ...@@ -841,10 +863,7 @@
} }
] ]
}, }
{
"id": "menuitem201",
"name": "测试界面逻辑" }
] ]
} }
...@@ -1473,6 +1492,16 @@ ...@@ -1473,6 +1492,16 @@
"name": "CheckKey", "name": "CheckKey",
"type": "BUILTIN" "type": "BUILTIN"
}, },
{
"id": "GetDynaCarousel",
"name": "行为2",
"type": "USERCUSTOM"
},
{
"id": "GetDynaImg",
"name": "行为",
"type": "USERCUSTOM"
},
{ {
"id": "Save", "id": "Save",
"name": "Save", "name": "Save",
......
[ [
{
"name": "年度",
"code": "Years",
"group": "",
"memo": "",
}
]
\ No newline at end of file
{
"name":"年度",
"code":"Years",
"group":"",
"memo":"",
"enable":"",
}
]
...@@ -22,9 +22,12 @@ ...@@ -22,9 +22,12 @@
<flowable:field name="majortext_ibizsample0021s"> <flowable:field name="majortext_ibizsample0021s">
<flowable:string>ibizsample0021name</flowable:string> <flowable:string>ibizsample0021name</flowable:string>
</flowable:field> </flowable:field>
<flowable:field name="isvalid"><flowable:string>1</flowable:string></flowable:field> <flowable:field name="isvalid"><flowable:string>0</flowable:string></flowable:field>
</extensionElements> </extensionElements>
<startEvent id="sid-Start001" name="开始"> <startEvent id="sid-Start001" name="开始">
<extensionElements>
<flowable:form process-form="refuseForm" />
</extensionElements>
</startEvent> </startEvent>
<exclusiveGateway id="sid-Exclusivegateway001"/> <exclusiveGateway id="sid-Exclusivegateway001"/>
<endEvent id="sid-End002" name="结束"> <endEvent id="sid-End002" name="结束">
...@@ -41,15 +44,15 @@ ...@@ -41,15 +44,15 @@
name="财务总监审批" > name="财务总监审批" >
<documentation>${majortext}</documentation> <documentation>${majortext}</documentation>
</userTask> </userTask>
<userTask flowable:category="${businessKey}" flowable:candidateUsers="${wfCoreService.getGroupUsers('DepartmentHeads|dept|CURDEPTID',execution)}" flowable:exclusive="true" <userTask flowable:category="${businessKey}" flowable:candidateUsers="${activedata.createman},${wfCoreService.getGroupUsers('DepartmentHeads|dept|CURDEPTID',execution)}" flowable:exclusive="true"
id="tid-5-Interactive001" id="tid-5-Interactive001"
name="部门经理审核" > name="部门经理审核" >
<documentation>${majortext}</documentation> <documentation>${majortext}</documentation>
<extensionElements> <extensionElements>
<flowable:form procfunc="sendback;addstepbefore;sendcopy;reassign" process-form="Main2" /> <flowable:form procfunc="addstepbefore;addstepafter;reassign" process-form="operationForm" process-utilform="Main" process-utilformname="主编辑表单" process-util2form="Main2" process-util2formname="主编辑表单2" process-util3form="refuseForm" process-util3formname="部门领导审批不通过操作表单" process-mobutilform="Main2" process-mobutilformname="主编辑表单2" process-mobutil2form="Main" process-mobutil2formname="主编辑表单" process-mobutil3form="approvedForm" process-mobutil3formname="部门领导审批通过操作表单" />
</extensionElements> </extensionElements>
</userTask> </userTask>
<userTask flowable:category="${businessKey}" flowable:candidateUsers="${wfCoreService.getGroupUsers('FinancialManager|org|CURORGID',execution)}" flowable:exclusive="true" <userTask flowable:category="${businessKey}" flowable:candidateUsers="${activedata.createman},${wfCoreService.getGroupUsers('FinancialManager|org|CURORGID',execution)}" flowable:exclusive="true"
id="tid-10-Interactive002" id="tid-10-Interactive002"
name="财务经理审核" > name="财务经理审核" >
<documentation>${majortext}</documentation> <documentation>${majortext}</documentation>
...@@ -98,13 +101,13 @@ ...@@ -98,13 +101,13 @@
<sequenceFlow id="lid-C61-c3aa2b65061d7d7a336da8f1abf60321" sourceRef="tid-5-Interactive001" targetRef="tid-10-Interactive002" name="同意"> <sequenceFlow id="lid-C61-c3aa2b65061d7d7a336da8f1abf60321" sourceRef="tid-5-Interactive001" targetRef="tid-10-Interactive002" name="同意">
<conditionExpression xsi:type="tFormalExpression" ><![CDATA[${sequenceFlowId=="lid-C61-c3aa2b65061d7d7a336da8f1abf60321"}]]></conditionExpression> <conditionExpression xsi:type="tFormalExpression" ><![CDATA[${sequenceFlowId=="lid-C61-c3aa2b65061d7d7a336da8f1abf60321"}]]></conditionExpression>
<extensionElements> <extensionElements>
<flowable:form sequenceFlowForm="approvedForm" sequenceFlowView="WFDynaActionView" nextCondition="ANY" /> <flowable:form sequenceFlowForm="operationForm" sequenceFlowView="WFDynaActionView" nextCondition="ANY" />
</extensionElements> </extensionElements>
</sequenceFlow> </sequenceFlow>
<sequenceFlow id="lid-C70-c3aa2b65061d7d7a336da8f1abf60321" sourceRef="tid-5-Interactive001" targetRef="tid-1-Interactive005" name="不同意"> <sequenceFlow id="lid-C70-c3aa2b65061d7d7a336da8f1abf60321" sourceRef="tid-5-Interactive001" targetRef="tid-1-Interactive005" name="不同意">
<conditionExpression xsi:type="tFormalExpression" ><![CDATA[${sequenceFlowId=="lid-C70-c3aa2b65061d7d7a336da8f1abf60321"}]]></conditionExpression> <conditionExpression xsi:type="tFormalExpression" ><![CDATA[${sequenceFlowId=="lid-C70-c3aa2b65061d7d7a336da8f1abf60321"}]]></conditionExpression>
<extensionElements> <extensionElements>
<flowable:form sequenceFlowForm="refuseForm" sequenceFlowView="WFDynaActionView" nextCondition="ANY" /> <flowable:form sequenceFlowForm="operationForm" sequenceFlowView="WFDynaActionView" nextCondition="ANY" />
</extensionElements> </extensionElements>
</sequenceFlow> </sequenceFlow>
<sequenceFlow id="lid-C52-26f1114aef1dcb82aee300afddac8c6e" sourceRef="tid-10-Interactive002" targetRef="sid-Exclusivegateway001" name="同意"> <sequenceFlow id="lid-C52-26f1114aef1dcb82aee300afddac8c6e" sourceRef="tid-10-Interactive002" targetRef="sid-Exclusivegateway001" name="同意">
...@@ -122,7 +125,7 @@ ...@@ -122,7 +125,7 @@
<sequenceFlow id="lid-C49-d09f88c9113cfa09490a7f62e0d5b949" sourceRef="tid-1-Interactive005" targetRef="tid-5-Interactive001" name="重新提交"> <sequenceFlow id="lid-C49-d09f88c9113cfa09490a7f62e0d5b949" sourceRef="tid-1-Interactive005" targetRef="tid-5-Interactive001" name="重新提交">
<conditionExpression xsi:type="tFormalExpression" ><![CDATA[${sequenceFlowId=="lid-C49-d09f88c9113cfa09490a7f62e0d5b949"}]]></conditionExpression> <conditionExpression xsi:type="tFormalExpression" ><![CDATA[${sequenceFlowId=="lid-C49-d09f88c9113cfa09490a7f62e0d5b949"}]]></conditionExpression>
<extensionElements> <extensionElements>
<flowable:form nextCondition="ANY" /> <flowable:form sequenceFlowForm="approvedForm" nextCondition="ANY" />
</extensionElements> </extensionElements>
</sequenceFlow> </sequenceFlow>
<sequenceFlow id="lid-C96-d09f88c9113cfa09490a7f62e0d5b949" sourceRef="tid-1-Interactive005" targetRef="sid-End002" name="取消"> <sequenceFlow id="lid-C96-d09f88c9113cfa09490a7f62e0d5b949" sourceRef="tid-1-Interactive005" targetRef="sid-End002" name="取消">
...@@ -148,7 +151,7 @@ ...@@ -148,7 +151,7 @@
<omgdi:Bounds x="555" y="360" width="100" height="80" /> <omgdi:Bounds x="555" y="360" width="100" height="80" />
</bpmndi:BPMNShape> </bpmndi:BPMNShape>
<bpmndi:BPMNShape id="BPMNShape-tid-5-Interactive001" bpmnElement="tid-5-Interactive001"> <bpmndi:BPMNShape id="BPMNShape-tid-5-Interactive001" bpmnElement="tid-5-Interactive001">
<omgdi:Bounds x="150" y="15" width="100" height="80" /> <omgdi:Bounds x="150" y="30" width="100" height="80" />
</bpmndi:BPMNShape> </bpmndi:BPMNShape>
<bpmndi:BPMNShape id="BPMNShape-sid-End002" bpmnElement="sid-End002"> <bpmndi:BPMNShape id="BPMNShape-sid-End002" bpmnElement="sid-End002">
<omgdi:Bounds x="186" y="389" width="30" height="30" /> <omgdi:Bounds x="186" y="389" width="30" height="30" />
......
此差异已折叠。
...@@ -6,8 +6,8 @@ ...@@ -6,8 +6,8 @@
<artifactId>demo</artifactId> <artifactId>demo</artifactId>
<groupId>cn.ibizlab</groupId> <groupId>cn.ibizlab</groupId>
<version>1.0.0.0</version> <version>1.0.0.0</version>
<name>后台服务</name> <name>Demo</name>
<description></description> <description>后台服务</description>
<packaging>pom</packaging> <packaging>pom</packaging>
<parent> <parent>
...@@ -105,7 +105,7 @@ ...@@ -105,7 +105,7 @@
<generateBackupPoms>false</generateBackupPoms> <generateBackupPoms>false</generateBackupPoms>
</configuration> </configuration>
</plugin> </plugin>
<plugin> <plugin>
<groupId>cn.ibizlab</groupId> <groupId>cn.ibizlab</groupId>
<artifactId>ibizlab-generator-plugin</artifactId> <artifactId>ibizlab-generator-plugin</artifactId>
<version>1.0-SNAPSHOT</version> <version>1.0-SNAPSHOT</version>
...@@ -137,4 +137,4 @@ ...@@ -137,4 +137,4 @@
</plugins> </plugins>
</build> </build>
</project> </project>
\ No newline at end of file
Markdown 格式
0% or
您添加了 0 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册