Skip to content

Commit 5100f64

Browse files
twj666twj666
committed
1. 修改部分细节，成功启动项目！（里程碑）
1 parent 08bf61d commit 5100f64

31 files changed

+419
-82
lines changed

‎entity_class_definitions.json‎

Lines changed: 304 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,304 @@
1+
[ {
2+
"className" : "Admin",
3+
"cdesc" : "物业管理员",
4+
"fields" : [ {
5+
"fname" : "id",
6+
"ftype" : "Integer",
7+
"fdesc" : "管理员ID"
8+
}, {
9+
"fname" : "username",
10+
"ftype" : "String",
11+
"fdesc" : "用户名"
12+
}, {
13+
"fname" : "password",
14+
"ftype" : "String",
15+
"fdesc" : "密码"
16+
}, {
17+
"fname" : "name",
18+
"ftype" : "String",
19+
"fdesc" : "姓名"
20+
}, {
21+
"fname" : "phone",
22+
"ftype" : "String",
23+
"fdesc" : "电话"
24+
} ],
25+
"featureIds" : [ "1001", "1002", "1003", "1004" ]
26+
}, {
27+
"className" : "Owner",
28+
"cdesc" : "业主",
29+
"fields" : [ {
30+
"fname" : "id",
31+
"ftype" : "Integer",
32+
"fdesc" : "业主ID"
33+
}, {
34+
"fname" : "username",
35+
"ftype" : "String",
36+
"fdesc" : "用户名"
37+
}, {
38+
"fname" : "password",
39+
"ftype" : "String",
40+
"fdesc" : "密码"
41+
}, {
42+
"fname" : "name",
43+
"ftype" : "String",
44+
"fdesc" : "姓名"
45+
}, {
46+
"fname" : "phone",
47+
"ftype" : "String",
48+
"fdesc" : "电话"
49+
}, {
50+
"fname" : "address",
51+
"ftype" : "String",
52+
"fdesc" : "住址"
53+
}, {
54+
"fname" : "propertyFee",
55+
"ftype" : "Double",
56+
"fdesc" : "物业费"
57+
} ],
58+
"featureIds" : [ "1001", "1002", "1003", "1004" ]
59+
}, {
60+
"className" : "MaintenanceWorker",
61+
"cdesc" : "维修人员",
62+
"fields" : [ {
63+
"fname" : "id",
64+
"ftype" : "Integer",
65+
"fdesc" : "维修人员ID"
66+
}, {
67+
"fname" : "username",
68+
"ftype" : "String",
69+
"fdesc" : "用户名"
70+
}, {
71+
"fname" : "password",
72+
"ftype" : "String",
73+
"fdesc" : "密码"
74+
}, {
75+
"fname" : "name",
76+
"ftype" : "String",
77+
"fdesc" : "姓名"
78+
}, {
79+
"fname" : "phone",
80+
"ftype" : "String",
81+
"fdesc" : "电话"
82+
}, {
83+
"fname" : "specialty",
84+
"ftype" : "String",
85+
"fdesc" : "专业技能"
86+
} ],
87+
"featureIds" : [ "1001", "1002", "1003", "1004" ]
88+
}, {
89+
"className" : "SecurityGuard",
90+
"cdesc" : "保安人员",
91+
"fields" : [ {
92+
"fname" : "id",
93+
"ftype" : "Integer",
94+
"fdesc" : "保安人员ID"
95+
}, {
96+
"fname" : "username",
97+
"ftype" : "String",
98+
"fdesc" : "用户名"
99+
}, {
100+
"fname" : "password",
101+
"ftype" : "String",
102+
"fdesc" : "密码"
103+
}, {
104+
"fname" : "name",
105+
"ftype" : "String",
106+
"fdesc" : "姓名"
107+
}, {
108+
"fname" : "phone",
109+
"ftype" : "String",
110+
"fdesc" : "电话"
111+
}, {
112+
"fname" : "shift",
113+
"ftype" : "String",
114+
"fdesc" : "班次"
115+
} ],
116+
"featureIds" : [ "1001", "1002", "1003", "1004" ]
117+
}, {
118+
"className" : "Cleaner",
119+
"cdesc" : "清洁人员",
120+
"fields" : [ {
121+
"fname" : "id",
122+
"ftype" : "Integer",
123+
"fdesc" : "清洁人员ID"
124+
}, {
125+
"fname" : "username",
126+
"ftype" : "String",
127+
"fdesc" : "用户名"
128+
}, {
129+
"fname" : "password",
130+
"ftype" : "String",
131+
"fdesc" : "密码"
132+
}, {
133+
"fname" : "name",
134+
"ftype" : "String",
135+
"fdesc" : "姓名"
136+
}, {
137+
"fname" : "phone",
138+
"ftype" : "String",
139+
"fdesc" : "电话"
140+
}, {
141+
"fname" : "workArea",
142+
"ftype" : "String",
143+
"fdesc" : "工作区域"
144+
} ],
145+
"featureIds" : [ "1001", "1002", "1003", "1004" ]
146+
}, {
147+
"className" : "Announcement",
148+
"cdesc" : "社区公告",
149+
"fields" : [ {
150+
"fname" : "id",
151+
"ftype" : "Integer",
152+
"fdesc" : "公告ID"
153+
}, {
154+
"fname" : "title",
155+
"ftype" : "String",
156+
"fdesc" : "标题"
157+
}, {
158+
"fname" : "content",
159+
"ftype" : "String",
160+
"fdesc" : "内容"
161+
}, {
162+
"fname" : "publishDate",
163+
"ftype" : "java.util.Date",
164+
"fdesc" : "发布日期"
165+
}, {
166+
"fname" : "adminId",
167+
"ftype" : "Integer",
168+
"fdesc" : "发布人ID"
169+
} ],
170+
"featureIds" : [ "1001", "1002", "1003", "1004" ]
171+
}, {
172+
"className" : "Complaint",
173+
"cdesc" : "业主投诉",
174+
"fields" : [ {
175+
"fname" : "id",
176+
"ftype" : "Integer",
177+
"fdesc" : "投诉ID"
178+
}, {
179+
"fname" : "ownerId",
180+
"ftype" : "Integer",
181+
"fdesc" : "业主ID"
182+
}, {
183+
"fname" : "content",
184+
"ftype" : "String",
185+
"fdesc" : "投诉内容"
186+
}, {
187+
"fname" : "status",
188+
"ftype" : "String",
189+
"fdesc" : "处理状态"
190+
}, {
191+
"fname" : "submitDate",
192+
"ftype" : "java.util.Date",
193+
"fdesc" : "提交日期"
194+
} ],
195+
"featureIds" : [ "1001", "1002", "1003", "1004" ]
196+
}, {
197+
"className" : "RepairRequest",
198+
"cdesc" : "维修请求",
199+
"fields" : [ {
200+
"fname" : "id",
201+
"ftype" : "Integer",
202+
"fdesc" : "维修请求ID"
203+
}, {
204+
"fname" : "ownerId",
205+
"ftype" : "Integer",
206+
"fdesc" : "业主ID"
207+
}, {
208+
"fname" : "description",
209+
"ftype" : "String",
210+
"fdesc" : "问题描述"
211+
}, {
212+
"fname" : "status",
213+
"ftype" : "String",
214+
"fdesc" : "处理状态"
215+
}, {
216+
"fname" : "submitDate",
217+
"ftype" : "java.util.Date",
218+
"fdesc" : "提交日期"
219+
}, {
220+
"fname" : "assignedWorkerId",
221+
"ftype" : "Integer",
222+
"fdesc" : "分配的维修人员ID"
223+
} ],
224+
"featureIds" : [ "1001", "1002", "1003", "1004" ]
225+
}, {
226+
"className" : "PropertyFeeBill",
227+
"cdesc" : "物业费账单",
228+
"fields" : [ {
229+
"fname" : "id",
230+
"ftype" : "Integer",
231+
"fdesc" : "账单ID"
232+
}, {
233+
"fname" : "ownerId",
234+
"ftype" : "Integer",
235+
"fdesc" : "业主ID"
236+
}, {
237+
"fname" : "amount",
238+
"ftype" : "Double",
239+
"fdesc" : "金额"
240+
}, {
241+
"fname" : "dueDate",
242+
"ftype" : "java.util.Date",
243+
"fdesc" : "到期日期"
244+
}, {
245+
"fname" : "paymentStatus",
246+
"ftype" : "String",
247+
"fdesc" : "支付状态"
248+
} ],
249+
"featureIds" : [ "1001", "1002", "1003", "1004" ]
250+
}, {
251+
"className" : "CommunityEvent",
252+
"cdesc" : "社区活动",
253+
"fields" : [ {
254+
"fname" : "id",
255+
"ftype" : "Integer",
256+
"fdesc" : "活动ID"
257+
}, {
258+
"fname" : "title",
259+
"ftype" : "String",
260+
"fdesc" : "标题"
261+
}, {
262+
"fname" : "description",
263+
"ftype" : "String",
264+
"fdesc" : "描述"
265+
}, {
266+
"fname" : "startDate",
267+
"ftype" : "java.util.Date",
268+
"fdesc" : "开始日期"
269+
}, {
270+
"fname" : "endDate",
271+
"ftype" : "java.util.Date",
272+
"fdesc" : "结束日期"
273+
}, {
274+
"fname" : "organizerId",
275+
"ftype" : "Integer",
276+
"fdesc" : "组织者ID"
277+
} ],
278+
"featureIds" : [ "1001", "1002", "1003", "1004" ]
279+
}, {
280+
"className" : "PublicFacility",
281+
"cdesc" : "公共设施",
282+
"fields" : [ {
283+
"fname" : "id",
284+
"ftype" : "Integer",
285+
"fdesc" : "设施ID"
286+
}, {
287+
"fname" : "name",
288+
"ftype" : "String",
289+
"fdesc" : "名称"
290+
}, {
291+
"fname" : "location",
292+
"ftype" : "String",
293+
"fdesc" : "位置"
294+
}, {
295+
"fname" : "status",
296+
"ftype" : "String",
297+
"fdesc" : "状态"
298+
}, {
299+
"fname" : "lastMaintenanceDate",
300+
"ftype" : "java.util.Date",
301+
"fdesc" : "上次维护日期"
302+
} ],
303+
"featureIds" : [ "1001", "1002", "1003", "1004" ]
304+
} ]

‎otow-frame/springbootframe/super/src/main/java/com/example/common/BaseContext.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
package com.example.common;
2+
23
// 线程方法
34
public class BaseContext {
45

‎otow-frame/springbootframe/super/src/main/java/com/example/common/annotation/Describe.java‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
package com.example.common.annotation;
2+
3+
import java.lang.annotation.Retention;
4+
import java.lang.annotation.RetentionPolicy;
5+
6+
@Retention(RetentionPolicy.RUNTIME)
7+
public @interface Describe {
8+
String value() default "";
9+
}

‎otow-frame/springbootframe/super/src/main/java/com/example/common/exception/ServeException.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package com.example.common.exception;
22

3+
import com.example.common.RCode;
34
import lombok.Data;
45
import lombok.EqualsAndHashCode;
56

‎otow-frame/springbootframe/super/src/main/java/com/example/config/MyBatisConfig.java‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,6 @@ public void insertFill(MetaObject metaObject) {
3737
this.strictInsertFill(metaObject, "createTime", Date.class, new Date());
3838
}
3939

40-
41-
4240
@Override
4341
public void updateFill(MetaObject metaObject) {
4442
this.strictUpdateFill(metaObject, "updateTime", Date.class, new Date());

‎pom.xml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,12 @@
4545
<version>3.17.4</version>
4646
</dependency>
4747

48+
<dependency>
49+
<groupId>cn.hutool</groupId>
50+
<artifactId>hutool-core</artifactId>
51+
<version>5.8.21</version>
52+
</dependency>
53+
4854
<dependency>
4955
<groupId>commons-lang</groupId>
5056
<artifactId>commons-lang</artifactId>

‎src/main/java/com/tml/otowbackend/engine/generator/funpack/pack/AddFunctionPack.java‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package com.tml.otowbackend.engine.generator.funpack.pack;
22

33

4+
import cn.hutool.core.bean.BeanUtil;
45
import com.baomidou.mybatisplus.core.toolkit.StringUtils;
56
import com.tml.otowbackend.engine.ai.result.FeaturePackage;
67
import com.tml.otowbackend.engine.generator.funpack.AbstrateFunctionPack;
@@ -38,7 +39,7 @@ protected void addMethodToController(ControllerTemplate controller) {
3839

3940
// controller-post 的 添加
4041
private MetaMethod getAddMethod(){
41-
ReqTemplate reqUser = new ReqTemplate(reqPackagePath, getParamString("className"));
42+
ReqTemplate reqUser = new ReqTemplate(getParamString("prefix") + reqPackagePath, getParamString("className"));
4243
MetaMethodParam metaMethodParam = new MetaMethodParam(reqUser.getClassName(),reqUser.getAllPackagePath(), StringUtils.firstToLowerCase(reqUser.getClassName()));
4344
metaMethodParam.addAnnotations(List.of(REQUEST_BODY));
4445
String body = String.format("%s.%s(%s);", getParamString("classLower"), addServiceMethod, metaMethodParam.getName());
@@ -47,17 +48,18 @@ private MetaMethod getAddMethod(){
4748

4849
@Override
4950
protected void addMethodToService(ServiceTemplate service) {
50-
ReqTemplate reqUser = new ReqTemplate(reqPackagePath, getParamString("className"));
51+
ReqTemplate reqUser = new ReqTemplate(getParamString("prefix") + reqPackagePath, getParamString("className"));
5152
MetaMethodParam metaMethodParam = new MetaMethodParam(reqUser.getClassName(),reqUser.getAllPackagePath(), StringUtils.firstToLowerCase(reqUser.getClassName()));
5253
service.addMethods(addServiceMethod, List.of(metaMethodParam));
5354
}
5455

5556
@Override
5657
protected void addMethodToServiceImpl(ServiceImplTemplate serviceImplTemplate) {
5758
AddServiceMethodTemplate addServiceMethodTemplate = new AddServiceMethodTemplate(saveTemplateFilePath, getParamString("className"));
58-
ReqTemplate reqUser = new ReqTemplate(reqPackagePath, getParamString("className"));
59+
ReqTemplate reqUser = new ReqTemplate(getParamString("prefix") + reqPackagePath, getParamString("className"));
5960
MetaMethodParam metaMethodParam = new MetaMethodParam(reqUser.getClassName(), reqUser.getAllPackagePath(), StringUtils.firstToLowerCase(reqUser.getClassName()));
6061
MetaMethod metaMethod = new MetaMethod(addServiceMethod, List.of(metaMethodParam), engine.generate(addServiceMethodTemplate));
6162
serviceImplTemplate.addMethod(metaMethod);
63+
serviceImplTemplate.addImportClazz(BeanUtil.class);
6264
}
6365
}

0 commit comments

Comments
 (0)